← 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/misc/hashTable.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/misc/hashTable.c
183
183
   } else {
184
184
      i = 1;
185
185
 
186
 
      while (bits) {
 
186
      while ((bits & 0x1) == 0) {
187
187
         i++;
188
188
         bits >>= 1;
189
189
      }
716
716
 
717
717
   oldEntry = HashTableLookup(ht, keyStr, hash);
718
718
   if (oldEntry != NULL) {
719
 
      if (ht->copyKey) {
720
 
         free((char *) entry->keyStr);
 
719
      if(entry != NULL) {
 
720
         if (ht->copyKey) {
 
721
            free((char *) entry->keyStr);
 
722
         }
 
723
         free(entry);
721
724
      }
722
 
      free(entry);
723
725
      return oldEntry;
724
726
   }
725
727