Changeset 1907

Timestamp:

02/07/07 14:42:37 (1 year ago)

Author:

moseley

Message:

Patch provided by Antony Dovgal Jan 31.

Files:

• swish-e/trunk/pod/CHANGES.pod (modified) (2 diffs)
• swish-e/trunk/src/db_native.c (modified) (6 diffs)
• swish-e/trunk/src/proplimit.c (modified) (2 diffs)

swish-e/trunk/pod/CHANGES.pod

@@ -10 +10 @@
-
-=over 4
+
+=item Patched leaks
+
+Anthony Dovgal patched two leaks.  One when there's a failure to
+open a file the file name was not freed.
+
+SwishSetSearchLimit() was nulling the search limits when an error was
+found in the parameters, but not freeing the existing limits.
-
-=item Leak in SwishResetSearchLimit
@@ -21 +29 @@
-relevant properties of the search object.
-Patch provided by Antony Dovgal.
-
-
-

swish-e/trunk/src/db_native.c

@@ -535 +535 @@
-    {
-        set_progerrno(INDEX_FILE_ERROR, DB->sw, "Couldn't open the property file \"%s\": ", s);
+        efree(s);
-        return (void *) DB;
-    }
@@ -550 +551 @@
-    {
-        set_progerrno(INDEX_FILE_ERROR, DB->sw, "Couldn't open the btree file \"%s\": ", s);
+        efree(s);
-        return (void *) DB;
-    }
@@ -566 +568 @@
-    {
-        set_progerrno(INDEX_FILE_ERROR, DB->sw, "Couldn't open the presorted index file \"%s\": ", s);
+        efree(s);
-        return (void *) DB;
-    }
@@ -582 +585 @@
-    {
-        set_progerrno(INDEX_FILE_ERROR, DB->sw, "Couldn't open the worddata file \"%s\": ", s);
+        efree(s);
-        return (void *) DB;
-    }
@@ -598 +602 @@
-    {
-        set_progerrno(INDEX_FILE_ERROR, DB->sw, "Couldn't open the hashfile file \"%s\": ", s);
+        efree(s);
-        return (void *) DB;
-    }
@@ -614 +619 @@
-    {
-        set_progerrno(INDEX_FILE_ERROR, DB->sw, "Couldn't open the array file \"%s\": ", s);
+        efree(s);
-        return (void *) DB;
-    }

swish-e/trunk/src/proplimit.c

@@ -240 +240 @@
-int SwishSetSearchLimit(SEARCH_OBJECT *srch, char *propertyname, char *low, char *hi)
-{
+    LIMIT_PARAMS *params;
-    reset_lasterror( srch->sw );
-    
@@ -248 +249 @@
-    }
-
-
+
+
+
+
+
+
+
+
-    return ( srch->sw->lasterror == 0 );
-
-}
-