2 files changed, 19 insertions, 7 deletions
diff --git a/src/gallium/include/pipe/p_debug.h b/src/gallium/include/pipe/p_debug.h
index f971ad3adc..f3dfa06216 100644
--- a/src/gallium/include/pipe/p_debug.h
+++ b/src/gallium/include/pipe/p_debug.h
@@ -158,6 +158,16 @@ void debug_mask_vprintf(uint32_t uuid,
                         const char *format, 
                         va_list ap);
 
+
+#ifdef DEBUG
+#define debug_warning(__msg) \
+   debug_printf("%s:%i:warning: %s\n", __FILE__, __LINE__, (__msg)) 
+#else
+#define debug_warning(__msg) \
+   ((void)0) 
+#endif
+
+
 #ifdef	__cplusplus
 }
 #endif
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index ef36ce75f7..c2e0f8c6a5 100644
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -88,14 +88,16 @@ FREE( void *ptr )
 static INLINE void *
 REALLOC( void *old_ptr, unsigned old_size, unsigned new_size )
 {
-   void *new_ptr;
-   if( new_size <= old_size ) {
-      return old_ptr;
-   }
-   new_ptr = MALLOC( new_size );
-   if( new_ptr ) {
-      memcpy( new_ptr, old_ptr, old_size );
+   void *new_ptr = NULL;
+
+   if (new_size != 0) {
+      new_ptr = MALLOC( new_size );
+      
+      if( new_ptr && old_ptr ) {
+         memcpy( new_ptr, old_ptr, old_size );
+      }
    }
+
    FREE( old_ptr );
    return new_ptr;
 }