Changeset 2340

Timestamp:

2006-06-20 14:59:14 (3 years ago)

Author:

conrad

Message:

bugfix: remove memory leak in oggz_write when closing a stream early (before
writing the next packet, when it has already been dequeued) -- detected by
valgrind on write-suffix test, and similar write-prefix test

Files:

• liboggz/trunk/src/liboggz/oggz_write.c (modified) (1 diff)
• liboggz/trunk/src/tests/Makefile.am (modified) (1 diff)
• liboggz/trunk/src/tests/write-prefix.c (modified) (2 diffs)

liboggz/trunk/src/liboggz/oggz_write.c

@@ -164 +164 @@
-  oggz_write_flush (oggz);
-
+  oggz_writer_packet_free (writer->current_zpacket);
+  oggz_writer_packet_free (writer->next_zpacket);
+
-  oggz_vector_foreach (writer->packet_queue,
-                       (OggzFunc)oggz_writer_packet_free);

liboggz/trunk/src/tests/Makefile.am

@@ -68 +68 @@
-write_bad_packetno_LDADD = $(OGGZ_LIBS)
-
-suf
+pre
-write_prefix_LDADD = $(OGGZ_LIBS)
-write_suffix_SOURCES = write-suffix.c

liboggz/trunk/src/tests/write-prefix.c

@@ -56 +56 @@
-  switch (packetno) {
-  case 0:
-suf
+pre
-    op.b_o_s = 1;
-    op.e_o_s = 0;
@@ -85 +85 @@
-  err = oggz_write_feed (oggz, &op, serialno, 0, NULL);
-  if (err != 0) {
-
+l
-    FAIL ("Could not feed OGGZ");
-#if 0