Changeset 599 for trunk/server/lib

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

Location:

trunk/server/lib

Files:

• tdb/common/io.c (modified) (2 diffs)
• util/asn1.c (modified) (1 diff)

trunk/server/lib/tdb/common/io.c

@@ -320 +320 @@
 {
         struct tdb_record rec;
-        tdb_off_t offset, new_size;     
+        tdb_off_t offset, new_size, top_size, map_size;
 
         if (tdb_lock(tdb, -1, F_WRLCK) == -1) {
@@ -330 +330 @@
         tdb->methods->tdb_oob(tdb, tdb->map_size + 1, 1);
 
-        /* always make room for at least 100 more records, and at
-           least 25% more space. Round the database up to a multiple
-           of the page size */
-        new_size = MAX(tdb->map_size + size*100, tdb->map_size * 1.25);
+        /* limit size in order to avoid using up huge amounts of memory for
+         * in memory tdbs if an oddball huge record creeps in */
+        if (size > 100 * 1024) {
+                top_size = tdb->map_size + size * 2;
+        } else {
+                top_size = tdb->map_size + size * 100;
+        }
+
+        /* always make room for at least top_size more records, and at
+           least 25% more space. if the DB is smaller than 100MiB,
+           otherwise grow it by 10% only. */
+        if (tdb->map_size > 100 * 1024 * 1024) {
+                map_size = tdb->map_size * 1.10;
+        } else {
+                map_size = tdb->map_size * 1.25;
+        }
+
+        /* Round the database up to a multiple of the page size */
+        new_size = MAX(top_size, map_size);
         size = TDB_ALIGN(new_size, tdb->page_size) - tdb->map_size;
 

trunk/server/lib/util/asn1.c

@@ -717 +717 @@
 {
         uint8_t b;
+        bool first_byte = true;
         *i = 0;
 
         while (!data->has_error && asn1_tag_remaining(data)>0) {
                 if (!asn1_read_uint8(data, &b)) return false;
+                if (first_byte) {
+                        if (b & 0x80) {
+                                /* Number is negative.
+                                   Set i to -1 for sign extend. */
+                                *i = -1;
+                        }
+                        first_byte = false;
+                }
                 *i = (*i << 8) + b;
         }