Changeset 1273

Timestamp:

12/09/07 16:35:55 (1 year ago)

Author:

perry

Message:

Don't crash when destroying an output trace that failed to initialise

Files:

• trunk/lib/trace.c (modified) (6 diffs)

trunk/lib/trace.c

@@ -422 +422 @@
-        libtrace->err.err_num = TRACE_ERR_NOERROR;
-        strcpy(libtrace->err.problem,"Error message set\n");
+        libtrace->format = NULL;
+        libtrace->uridata = NULL;
-        
-        /* parse the URI to determine what sort of event we are dealing with */
@@ -431 +433 @@
-        }
-        
-        libtrace->format = NULL;
-        for(tmp=formats_list;tmp;tmp=tmp->next) {
-                if (strlen(scan) == strlen(tmp->name) &&
@@ -441 +442 @@
-                                }
-        }
+        free(scan);
+
-        if (libtrace->format == NULL) {
-                trace_set_err_out(libtrace,TRACE_ERR_BAD_FORMAT,
@@ -447 +450 @@
-        }
-        libtrace->uridata = strdup(uridata);
-
-
-        /* libtrace->format now contains the type of uri
@@ -470 +472 @@
-
-
-        free(scan);
-        libtrace->started=false;
-        return libtrace;
@@ -628 +629 @@
-        if (libtrace->format)
-                libtrace->format->fin_output(libtrace);
-
+
+
-        free(libtrace);
-}