Changeset 5131:57cb309489a3 in roaraudio

Timestamp:

09/06/11 15:07:18 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Fixed segfaul in FLAC cf (Closes: #177)

Files:

• ChangeLog (modified) (1 diff)
• libroar/buffer.c (modified) (5 diffs)
• roard/codecfilter_flac.c (modified) (1 diff)

ChangeLog

@@ +1 @@
+v. 0.4rc1 - ?
+        * Fixed segfaul in FLAC cf (Closes: #177)
+
 v. 0.4rc0 - Mon Sep 05 2011 15:25 CEST
         Prereleases: 0: Fri Aug 18 2011 27:37 CEST

libroar/buffer.c

@@ -58 +58 @@
 
 #define _ckbuf_free(m)  if ( buf == NULL || (m) ) { roar_err_set(ROAR_ERROR_FAULT); return -1; }
-#define _ckbuf(m)  _ckbuf_free((m)); if ( _ckmem_corruption(buf) == -1 ) return -1;
-
-static int inline _ckmem_corruption(struct roar_buffer * buf) {
- int flags = buf->flags & (ROAR_BUFFER_FLAG_USEABLE|ROAR_BUFFER_FLAG_FREED);
+#define _ckbuf(m)       if ( _ckmem_corruption(buf, (m)) == -1 ) return -1;
+
+// if we use the 'inline' keyword here the program segfaults. why?
+static int _ckmem_corruption(volatile struct roar_buffer * buf, int m) {
+ int flags;
+
+ ROAR_DBG("_ckmem_corruption(buf=%p) = ?", buf);
+
+ // we need to recheck here, why?
+ // gcc changes the order of the above macros. why?
+ // this is a strange world.
+ if ( buf == NULL || m ) {
+  ROAR_DBG("_ckmem_corruption(buf=%p) = -1 // FAULT", buf);
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ ROAR_DBG("_ckmem_corruption(buf=%p) = ?", buf);
+
+ flags = buf->flags & (ROAR_BUFFER_FLAG_USEABLE|ROAR_BUFFER_FLAG_FREED);
 
  ROAR_DBG("_ckmem_corruption(buf=%p{.flags=0x%.4x, ...} = ?", buf, buf->flags);
@@ -168 +184 @@
  }
 
- _ckmem_corruption(buf);
+ _ckmem_corruption(buf, 0);
 
  ROAR_DBG("roar_buffer_unref(buf=%p) = ?", buf);
@@ -196 +212 @@
   ROAR_DBG("roar_buffer_unref(buf=%p) = ?", buf);
 
-  _ckmem_corruption(cur);
+  _ckmem_corruption(cur, 0);
 
   if ( roar_buffer_get_flag(cur, ROAR_BUFFER_FLAG_NOFREE) != 1 )
@@ -370 +386 @@
   ROAR_DBG("roar_buffer_shift_out(*): todo=%u, cur=%p", (unsigned int) todo, cur);
 
-  _ckmem_corruption(cur);
+  _ckmem_corruption(cur, 0);
 
   if ( roar_buffer_get_len(cur, &cl) == -1 )
@@ -570 +586 @@
 
 int roar_buffer_ring_stats (struct roar_buffer *  buf, struct roar_buffer_stats * stats) {
- _ckbuf(0)
+ ROAR_DBG("roar_buffer_ring_stats(buf=%p, stats=%p) = ?", buf, stats);
+
+ _ckbuf(0)
+
+ ROAR_DBG("roar_buffer_ring_stats(buf=%p, stats=%p) = ?", buf, stats);
 
  stats->parts        = 0;

roard/codecfilter_flac.c

@@ -272 +272 @@
   }
 
-  roar_buffer_ring_stats(self->decoder.written, &stats);
+  if ( self->decoder.written == NULL ) {
+   stats.bytes = 0;
+  } else {
+   roar_buffer_ring_stats(self->decoder.written, &stats);
+  }
  }