← Back to branch summary

~n-muench/ubuntu/oneiric/open-vm-tools/open-vm-tools.fix-836277

« back to all changes in this revision

Viewing changes to lib/string/bsd_vsnprintf.c

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2008-08-15 21:21:40 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080815212140-05fhxj8wroosysmj
Tags: 2008.08.08-109361-1ubuntu1
https://launchpad.net/bugs/258393
* Merge from Debian unstable (LP: #258393), remaining Ubuntu change:
  - add ubuntu_toolchain_FTBFS.dpatch patch, fix FTBFS
* Update ubuntu_toolchain_FTBFS.dpatch patch for the new version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/string/bsd_vsnprintf.c
467
467
#ifndef _WIN32
468
468
   va_list orgap;          /* original argument pointer */
469
469
#endif
470
 
   char *convbuf;      /* wide to multibyte conversion result */
 
470
   char *convbuf = NULL;      /* wide to multibyte conversion result */
471
471
   BSDFmt_StrBuf sbuf;
472
472
 
473
473
   /*
988
988
            wchar_t *wcp;
989
989
 
990
990
            /* Argument is wchar_t * */
991
 
            if (convbuf != NULL)
 
991
            if (convbuf != NULL) {
992
992
               free(convbuf);
 
993
               convbuf = NULL;
 
994
            }
993
995
            if ((wcp = GETARG(wchar_t *)) == NULL)
994
996
               cp = "(null)";
995
997
            else {
1231
1233
   if (dtoaresult != NULL)
1232
1234
      freedtoa(dtoaresult);
1233
1235
#endif
1234
 
   if (convbuf != NULL)
 
1236
   if (convbuf != NULL) {
1235
1237
      free(convbuf);
 
1238
      convbuf = NULL;
 
1239
   }
1236
1240
   if (sbuf.error) {
1237
1241
      ret = EOF;
1238
1242
   }