[mapserver-commits] r9376 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-10-05 10:09:14 -0400 (Mon, 05 Oct 2009)
New Revision: 9376

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maphash.c
Log:
Fixed msRemoveHashTable function when 2 keys have the same hash (#3146)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-01 22:44:54 UTC (rev 9375)
+++ trunk/mapserver/HISTORY.TXT	2009-10-05 14:09:14 UTC (rev 9376)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed msRemoveHashTable function when 2 keys have the same hash (#3146)
+
 - Fix raster thread deadlock condition on posix/linux (#3145)
 
 - Do not route thread debug output through msDebug which requires locking.

Modified: trunk/mapserver/maphash.c
===================================================================
--- trunk/mapserver/maphash.c	2009-10-01 22:44:54 UTC (rev 9375)
+++ trunk/mapserver/maphash.c	2009-10-05 14:09:14 UTC (rev 9376)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * Project:  MapServer
  * Purpose:  Implement hashTableObj class.
@@ -197,7 +197,7 @@
                 break;
             }
             else {
-                table->items[hash(key)] = NULL;
+                table->items[hash(key)] = tp->next;
                 free(tp);
                 break;
             }