[xiph-commits] r3856 - liboggz/trunk/src/tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2009-02-21 04:02:46 -0800 (Sat, 21 Feb 2009)
New Revision: 3856

Modified:
   liboggz/trunk/src/tools/oggz-info.c
Log:
oggz-info: chase allocs, and fix a leak caught by valgrind

Modified: liboggz/trunk/src/tools/oggz-info.c
===================================================================
--- liboggz/trunk/src/tools/oggz-info.c	2009-02-21 10:53:42 UTC (rev 3855)
+++ liboggz/trunk/src/tools/oggz-info.c	2009-02-21 12:02:46 UTC (rev 3856)
@@ -52,6 +52,8 @@
 
 #define READ_BLOCKSIZE 1024000
 
+static char * progname;
+
 static void
 usage (const char * progname)
 {
@@ -83,6 +85,13 @@
   printf ("Please report bugs to <ogg-dev at xiph.org>\n");
 }
 
+static void
+exit_out_of_memory (void)
+{
+  fprintf (stderr, "%s: Out of memory\n", progname);
+  exit (1);
+}
+
 #define SEP "------------------------------------------------------------"
 
 typedef struct _OI_Info OI_Info;
@@ -90,8 +99,11 @@
 typedef struct _OI_TrackInfo OI_TrackInfo;
 
 /* Let's get functional */
-typedef void (*OI_TrackFunc) (OI_Info * info, OI_TrackInfo * oit, long serialno);
+typedef int (*OI_TrackFunc) (OI_Info * info, OI_TrackInfo * oit, long serialno);
 
+/* Out of memory return value from OI_TrackFunc, aborts oggz_info_apply() */
+#define OIT_OOM (-1)
+
 struct _OI_Info {
   OGGZ * oggz;
   OggzTable * tracks;
@@ -163,7 +175,7 @@
   return (double)((double)(granule * gr_d) / (double)gr_n);
 }
 
-static void
+static int
 oggz_info_apply (OI_TrackFunc func, OI_Info * info)
 {
   OI_TrackInfo * oit;
@@ -173,8 +185,13 @@
   n = oggz_table_size (info->tracks);
   for (i = 0; i < n; i++) {
     oit = oggz_table_nth (info->tracks, i, &serialno);
-    if (oit) func (info, oit, serialno);
+    if (oit) {
+      if (func (info, oit, serialno) == OIT_OOM)
+        exit_out_of_memory();
+    }
   }
+
+  return 0;
 }
 
 static void
@@ -198,6 +215,7 @@
   OI_TrackInfo * oit;
 
   oit = malloc (sizeof (OI_TrackInfo));
+  if (oit == NULL) return NULL;
 
   oi_stats_clear (&oit->pages);
   oi_stats_clear (&oit->packets);
@@ -252,7 +270,7 @@
   }
 }
 
-static void
+static int
 ot_fisbone_print(OI_Info * info, OI_TrackInfo *oit) {
 
   char *allocated, *messages, *token;
@@ -269,8 +287,11 @@
     ot_fprint_time (stdout, gp_to_time (info->oggz, oit->fbInfo.serial_no, oit->fbInfo.start_granule));
     printf ("\n");
     printf("\tPreroll: %d\n", oit->fbInfo.preroll);
+
     allocated = messages = _ogg_calloc(oit->fbInfo.current_header_size+1, sizeof(char));
+    if (messages == NULL) return OIT_OOM;
     strcpy(messages, oit->fbInfo.message_header_fields);
+
     printf("\tMessage Header Fields:\n");
     while (1) {
       token = strsep(&messages, "\n\r");
@@ -281,10 +302,12 @@
     printf("\n");
     _ogg_free(allocated);
   }
+
+  return 0;
 }
 
 /* oggz_info_trackinfo_print() */
-static void
+static int
 oit_print (OI_Info * info, OI_TrackInfo * oit, long serialno)
 {
   if (oit->codec_name) {
@@ -325,9 +348,11 @@
     ot_fishead_print(oit);
   }
   if (show_extra_skeleton_info && oit->has_fisbone) {
-    ot_fisbone_print(info, oit);
+    if (ot_fisbone_print(info, oit) == OIT_OOM);
+      return OIT_OOM;
   }
 
+  return 0;
  }
 
 static void
@@ -340,11 +365,12 @@
   }
 }
 
-static void
+static int
 oit_calc_average (OI_Info * info, OI_TrackInfo * oit, long serialno)
 {
   oi_stats_average (&oit->pages);
   oi_stats_average (&oit->packets);
+  return 0;
 }
 
 static void
@@ -361,11 +387,12 @@
   }
 }
 
-static void
+static int
 oit_calc_stddev (OI_Info * info, OI_TrackInfo * oit, long serialno)
 {
   oi_stats_stddev (&oit->pages);
   oi_stats_stddev (&oit->packets);
+  return 0;
 }
 
 static int
@@ -378,6 +405,7 @@
   oit = oggz_table_lookup (info->tracks, serialno);
   if (oit == NULL) {
     oit = oggz_info_trackinfo_new ();
+    if (oit == NULL) return -1;
     oggz_table_insert (info->tracks, serialno, oit);
   }
 
@@ -491,6 +519,10 @@
 
   while ((n = oggz_read (oggz, READ_BLOCKSIZE)) > 0);
 
+  /* We only return an error from our user callback on OOM */
+  if (n == OGGZ_ERR_STOP_ERR || n == OGGZ_ERR_OUT_OF_MEMORY)
+    exit_out_of_memory ();
+
   oggz_info_apply (oit_calc_average, info);
 
   /* Now we are at the end of the file, calculate the duration */
@@ -519,13 +551,15 @@
   oggz_set_read_callback (oggz, -1, read_packet_pass2, info);
 
   while ((n = oggz_read (oggz, READ_BLOCKSIZE)) > 0);
+  if (n == OGGZ_ERR_OUT_OF_MEMORY)
+    exit_out_of_memory();
 
   oggz_info_apply (oit_calc_stddev, info);
 
   return 0;
 }
 
-static void
+static int
 oit_delete (OI_Info * info, OI_TrackInfo * oit, long serialno)
 {
   if (oit->codec_info) {
@@ -533,6 +567,9 @@
       fisbone_clear (&oit->fbInfo);
     free (oit->codec_info);
   }
+  free (oit);
+
+  return 0;
 }
 
 int
@@ -541,7 +578,6 @@
   int show_version = 0;
   int show_help = 0;
 
-  char * progname;
   int i;
   int show_all = 0;