Changeset 4972:4341665f3041 in roaraudio for libroar/memmgr.c

Timestamp:

05/16/11 14:16:42 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

detect changes in null-buffer on several memmgr calls

File:

• libroar/memmgr.c (modified) (7 diffs)

libroar/memmgr.c

@@ -36 +36 @@
 #include "libroar.h"
 
-#ifdef ROAR_USE_MEMMGR
 #define NULL_BUFFER_CONST "RoarAudio"
 static char _libroar_null_buffer[] = NULL_BUFFER_CONST; // A byte sequense >= 8 byte.
-#endif
+
+static inline void _libroar_null_buffer_check(void) {
+ if ( memcmp(_libroar_null_buffer, NULL_BUFFER_CONST, sizeof(_libroar_null_buffer)) != 0 )
+  roar_panic(ROAR_FATAL_ERROR_MEMORY_CORRUPTION_GUARD, NULL);
+ memcpy(_libroar_null_buffer, NULL_BUFFER_CONST, sizeof(_libroar_null_buffer));
+}
 
 #define _err(x) do { roar_err_set((x)); return NULL; } while (0)
@@ -47 +51 @@
  void * ret;
 
- if ( nmemb == 0 || size == 0 )
-  return _libroar_null_buffer;
+ if ( nmemb == 0 || size == 0 ) {
+  _libroar_null_buffer_check();
+  return _libroar_null_buffer;
+ }
 
 #ifdef ROAR_HAVE_CALLOC
@@ -72 +78 @@
  void * ret;
 
- if ( size == 0 )
-  return _libroar_null_buffer;
+ if ( size == 0 ) {
+  _libroar_null_buffer_check();
+  return _libroar_null_buffer;
+ }
 
 #ifdef ROAR_HAVE_MALLOC
@@ -93 +101 @@
 
 int    roar_mm_free(void *ptr) {
- if ( ptr == _libroar_null_buffer )
+
+ if ( ptr == _libroar_null_buffer ) {
+  _libroar_null_buffer_check();
   return 0;
+ }
 
 #ifdef ROAR_HAVE_FREE
@@ -119 +130 @@
  if ( size == 0 ) {
   roar_mm_free(ptr);
+  _libroar_null_buffer_check();
   return _libroar_null_buffer;
  }
@@ -142 +154 @@
   _err(ROAR_ERROR_FAULT);
 
+ if ( len == 0 ) {
+  _libroar_null_buffer_check();
+  return _libroar_null_buffer;
+ }
+
  ret = roar_mm_malloc(len);
 
@@ -189 +206 @@
  if ( s == NULL )
   _err(ROAR_ERROR_FAULT);
+
+ if ( n == 0 ) {
+  _libroar_null_buffer_check();
+  return _libroar_null_buffer;
+ }
 
 #ifdef ROAR_HAVE_STRDUP