Changeset 24162 for main/trunk/greenstone2/common-src/src

Timestamp:

2011-06-15T14:46:59+12:00 (13 years ago)

Author:

mdewsnip

Message:

Fixed problem in Greenstone's unitool::create_unicat_data() causing crashes on 64-bit machines (when Greenstone is compiled in 64-bit mode). The old malloc() parameter calculation assumed that an unsigned long was always 4 bytes, but this isn't true on 64-bit machines. Although the space required for this structure is actually the same on 64-bit machines (2 bits are needed for each of 65536 values), the rest of the code assumes the machine is 32-bit and there are 16 values per array entry. Rather than trying to change the rest of the code to work on both 32-bit and 64-bit machines, I've just changed this calculation so the block allocated is twice the size on 64-bit machines. This is a bit wasteful because half the space isn't used, but it's only 16KB so I don't think it's worth worrying about.

File:

• main/trunk/greenstone2/common-src/src/lib/unitool.cpp (modified) (1 diff)

main/trunk/greenstone2/common-src/src/lib/unitool.cpp

@@ -1483 +1483 @@
 
   if (unicode_cat_data != NULL) return;
-  unicode_cat_data = (unsigned long *) malloc (0x10000/4);
+  // 64-BIT FIX: The old malloc() parameter calculation assumed that an unsigned long was always 4 bytes, but this
+  //   isn't true on 64-bit machines. Although the space required for this structure is actually the same on 64-bit
+  //   machines (2 bits are needed for each of 65536 values), the rest of the code assumes the machine is 32-bit
+  //   and there are 16 values per array entry. Rather than trying to change the rest of the code to work on both
+  //   32-bit and 64-bit machines, I've just changed this calculation so the block allocated is twice the size on
+  //   64-bit machines. This is a bit wasteful because half the space isn't used, but it's only 16KB so I don't
+  //   think it's worth worrying about. [Michael Dewsnip, DL Consulting Ltd.]
+  unicode_cat_data = (unsigned long *) malloc((0x10000 / 16) * sizeof(unsigned long));
   if (unicode_cat_data == NULL) return;