Changeset d694056 for lib

Timestamp:

09/18/06 23:11:38 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

3eff1c8

Parents:

279486e

Message:

More splint fixes, at least one is critical (returning a free'd pointer)

File:

• lib/trace.c (modified) (3 diffs)

lib/trace.c

@@ -117 +117 @@
 static char *xstrndup(const char *src,size_t n)
 {       
-        char *ret=(char*)malloc(n+1);
+        char *ret=(restrict char*)malloc(n+1);
+        if (ret==NULL) {
+                fprintf(stderr,"Out of memory");
+                exit(EXIT_FAILURE);
+        }
         xstrncpy(ret,src,n);
         return ret;
@@ -294 +298 @@
 
         assert(uri && "Passing NULL to trace_create makes me a very sad program");
+
+        if (!libtrace) {
+                /* Out of memory */
+                return NULL;
+        }
         
         libtrace->err.err_num = TRACE_ERR_NOERROR;
@@ -458 +467 @@
                 switch(libtrace->format->init_output(libtrace)) {
                         case -1: /* failure */
-                                free(libtrace);
                                 return libtrace;
                         case 0: /* success */