[xiph-cvs] cvs commit: vorbis-tools/ogg123 ogg123.c ogg123.h

[Stan Seibert]

volsung     01/11/01 18:22:10

  Modified:    ogg123   Tag: volsung_kc_20011011 ogg123.c ogg123.h
  Log:
  Uninitialized element marking end of array.  Fixes previous bug.

Revision  Changes    Path
No                   revision

No                   revision

1.39.2.30.2.6 +5 -2      vorbis-tools/ogg123/ogg123.c

Index: ogg123.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.c,v
retrieving revision 1.39.2.30.2.5
retrieving revision 1.39.2.30.2.6
diff -u -r1.39.2.30.2.5 -r1.39.2.30.2.6
--- ogg123.c	2001/10/31 05:38:55	1.39.2.30.2.5
+++ ogg123.c	2001/11/02 02:22:08	1.39.2.30.2.6
@@ -14,7 +14,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: ogg123.c,v 1.39.2.30.2.5 2001/10/31 05:38:55 volsung Exp $
+ last mod: $Id: ogg123.c,v 1.39.2.30.2.6 2001/11/02 02:22:08 volsung Exp $
 
  ********************************************************************/
 
@@ -181,6 +181,9 @@
   cur = &stats[9]; /* output buffer status */
   cur->prio = 1; cur->enabled = 0; cur->formatstr = "%s";
   cur->type = stat_stringarg; cur->arg.stringarg = NULL;
+
+  cur = &stats[10]; /* End flag */
+  cur->formatstr = NULL;
 }
 
 void SetTime (Stat_t stats[], ogg_int64_t sample)
@@ -270,7 +273,7 @@
         free (stats[9].arg.stringarg);
       stats[9].arg.stringarg = strdup (strbuf);
       
-      PrintStatsLine (Options.statOpts.stats);
+      PrintStatsLine (stats);
     }
 
   pthread_mutex_unlock(&stats_lock);

1.7.2.12.2.2 +3 -2      vorbis-tools/ogg123/ogg123.h

Index: ogg123.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.h,v
retrieving revision 1.7.2.12.2.1
retrieving revision 1.7.2.12.2.2
diff -u -r1.7.2.12.2.1 -r1.7.2.12.2.2
--- ogg123.h	2001/10/31 05:38:56	1.7.2.12.2.1
+++ ogg123.h	2001/11/02 02:22:09	1.7.2.12.2.2
@@ -11,7 +11,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: ogg123.h,v 1.7.2.12.2.1 2001/10/31 05:38:56 volsung Exp $
+ last mod: $Id: ogg123.h,v 1.7.2.12.2.2 2001/11/02 02:22:09 volsung Exp $
 
  ********************************************************************/
 
@@ -55,8 +55,9 @@
      * stats[7] - input buffer status
      * stats[8] - output buffer fill %
      * stats[9] - output buffer status
+     * stats[10] - Null format string to mark end of array
      */
-    Stat_t stats[10];
+    Stat_t stats[11];
   } statOpts;
   InputOpts_t inputOpts;
   struct {

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.