Changeset 4e65f42 for lib/trace.c

Timestamp:

05/11/06 11:40:21 (16 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

83445f0

Parents:

3fcb8b4

Message:

Fixed segmentation faults when trace_destroy is called on a trace that wasn't successfully created
libdl is now checked for and only linked against if available (BSD's don't have a libdl)
Fixed the libpacketdump .so's to use libtrace's generic protocol headers as well as trace_ether_ntoa
Added missing check for strlcpy
Added a couple of #defines to various tools that needed them under FreeBSD
Removed some needless #includes from the libpacketdump .so's

File:

• lib/trace.c (modified) (1 diff)

lib/trace.c

@@ -577 +577 @@
 DLLEXPORT void trace_destroy(libtrace_t *libtrace) {
         assert(libtrace);
-        if (libtrace->started && libtrace->format->pause_input)
-                libtrace->format->pause_input(libtrace);
-        libtrace->format->fin_input(libtrace);
+        if (libtrace->format) {
+                if (libtrace->started && libtrace->format->pause_input)
+                        libtrace->format->pause_input(libtrace);
+                libtrace->format->fin_input(libtrace);
+        }
         /* need to free things! */
-        free(libtrace->uridata);
-        destroy_tracefifo(libtrace->fifo);
+        if (libtrace->uridata)
+                free(libtrace->uridata);
+        if (libtrace->fifo)
+                destroy_tracefifo(libtrace->fifo);
         free(libtrace);
 }