[xiph-cvs] cvs commit: ogg/src stream.c

[Arc]

arc         03/11/30 10:56:32

  Modified:    src      Tag: libogg2-zerocopy stream.c
  Log:
  Simple fix; two lines needed to be switched so that the pointer
  og.header points to something before it's used in ogg_page_pageno(&og);
  
  Backtrace:
  #0  oggbyte_init (b=0xbfbff71c, or=0x4, bs=0x0) at bytewise.c:90
  #1  0x281c7557 in ogg_page_pageno (og=0xbfbff71c) at sync.c:68
  #2  0x281c7b2b in _span_queued_page (os=0x8101100) at stream.c:296
  #3  0x281c7ed1 in _packetout (os=0x8101100, op=0x8155160, adv=1)
      at stream.c:437
  #4  0x281c814b in ogg_stream_packetout (os=0x8101100, op=0x8155160)
      at stream.c:511

Revision  Changes    Path
No                   revision

<p>No                   revision

<p>1.1.2.14  +2 -2      ogg/src/Attic/stream.c

Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ogg/src/Attic/stream.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- stream.c	15 Aug 2003 20:31:57 -0000	1.1.2.13
+++ stream.c	30 Nov 2003 15:56:32 -0000	1.1.2.14
@@ -12,7 +12,7 @@
 
  function: code raw packets into framed Ogg logical stream and
            decode Ogg logical streams back into raw packets
- last mod: $Id: stream.c,v 1.1.2.13 2003/08/15 20:31:57 xiphmont Exp $
+ last mod: $Id: stream.c,v 1.1.2.14 2003/11/30 15:56:32 arc Exp $
 
  ********************************************************************/
 
@@ -293,8 +293,8 @@
       long pageno;
       oggbyte_buffer ob;
 
-      pageno=ogg_page_pageno(&og);
       og.header=os->header_tail; /* only for parsing header values */
+      pageno=ogg_page_pageno(&og);
 
       oggbyte_init(&ob,os->header_tail,0);
       os->lacing_fill=oggbyte_read1(&ob,26);

<p><p>--- >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.