Changeset 4597

Timestamp:

11/06/08 15:05:58 (2 months ago)

Author:

martin

Message:

fixed leak
fixed build if !HAVE_BACKTRACE

Files:

• trunk/src/libstrongswan/utils/backtrace.c (modified) (2 diffs)

trunk/src/libstrongswan/utils/backtrace.c

@@ -104 +104 @@
-                    fputc(c, file);
-                }
+                pclose(output);
-            }
-            else
@@ -164 +165 @@
-    private_backtrace_t *this;
-    void *frames[50];
-
+ = 0
-    
+#ifdef HAVE_BACKTRACE
-    frame_count = backtrace(frames, countof(frames));
+#endif /* HAVE_BACKTRACE */
+    frame_count = max(frame_count - skip, 0);
-    this = malloc(sizeof(private_backtrace_t) + frame_count * sizeof(void*));
-this->frame_count = frame_count - skip
-memcpy(this->frames, frames + skip, this->frame_count * sizeof(void*))
+memcpy(this->frames, frames + skip, frame_count * sizeof(void*))
+this->frame_count = frame_count
-    
-    this->public.log = (void(*)(backtrace_t*,FILE*))log_;