Changeset 585

Timestamp:

2004-09-19 23:06:28 (4 years ago)

Author:

conrad

Message:

Close a memory leak related to using OGGZ_AUTO with theora streams:

• mark theora auto_metric as internal, ie. its user_data gets
  automatically free'd when the metric is updated.
  
• free user_data for internal metrics associated with the whole
  OGGZ object (ie. not just stream-specific metrics) on oggz_close()
  

Files:

• liboggz/trunk/src/liboggz/oggz.c (modified) (1 diff)
• liboggz/trunk/src/liboggz/oggz_auto.c (modified) (2 diffs)

liboggz/trunk/src/liboggz/oggz.c

@@ -185 +185 @@
-  oggz_vector_foreach (oggz->streams, oggz_stream_clear);
-  oggz_vector_delete (oggz->streams);
+
+  if (oggz->metric_internal)
+    oggz_free (oggz->metric_user_data);
-
-  if (oggz->file != NULL) {

liboggz/trunk/src/liboggz/oggz_auto.c

@@ -48 +48 @@
-#include "oggz_macros.h"
-
+/* Allow use of internal metrics; ie. the user_data for these gets free'd
+ * when the metric is overwritten, or on close */
+int oggz_set_metric_internal (OGGZ * oggz, long serialno, OggzMetric metric,
+                              void * user_data, int internal);
+
-#define INT32_LE_AT(x) _le_32((*(ogg_int32_t *)(x)))
-#define INT32_BE_AT(x) _be_32((*(ogg_int32_t *)(x)))
@@ -174 +179 @@
-#endif
-
-/*oggz_set_metric_internal (oggz, serialno, auto_theora_metric, tdata, 1);*/
-oggz_set_metric (oggz, serialno, auto_theora_metric, tdata);
+oggz_set_metric_internal (oggz, serialno, auto_theora_metric, tdata, 1);
+/*oggz_set_metric (oggz, serialno, auto_theora_metric, tdata);*/
-
-  return 1;