commit 9434e1996513c02861969fb4b766ab837587c4c1
author Alexandre Julliard <julliard@winehq.org> Thu Dec 04 16:12:04 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Thu Dec 04 16:12:04 2008 +0100
tree 0ea13400d89b8cc8bceb48bd851da43e6b8f10f7
parent 9960ab2418b18245dcf249da3a0ea097cdf62553

server: Limit the number of allocated handles before running out of memory.

server/handle.c

diff --git a/server/handle.c b/server/handle.c
index 29214d6..37cfa9b 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -64,6 +64,7 @@
 #define RESERVED_ALL           (RESERVED_INHERIT | RESERVED_CLOSE_PROTECT)
 
 #define MIN_HANDLE_ENTRIES  32
+#define MAX_HANDLE_ENTRIES  0x00ffffff
 
 
 /* handle to table index conversion */
@@ -191,13 +192,12 @@
 static int grow_handle_table( struct handle_table *table )
 {
     struct handle_entry *new_entries;
-    int count = table->count;
+    int count = min( table->count * 2, MAX_HANDLE_ENTRIES );
 
-    if (count >= INT_MAX / 2) return 0;
-    count *= 2;
-    if (!(new_entries = realloc( table->entries, count * sizeof(struct handle_entry) )))
+    if (count == table->count ||
+        !(new_entries = realloc( table->entries, count * sizeof(struct handle_entry) )))
     {
-        set_error( STATUS_NO_MEMORY );
+        set_error( STATUS_INSUFFICIENT_RESOURCES );
         return 0;
     }
     table->entries = new_entries;