gallium: fix REALLOC() to copy smaller of old/new sizes

2008-03-24 12:50:28 -06:00
parent 48726e129a
commit 4e398df682
1 changed files with 3 additions and 3 deletions
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -107,10 +107,10 @@ REALLOC( void *old_ptr, unsigned old_size, unsigned new_size )
   void *new_ptr = NULL;

   if (new_size != 0) {
+      unsigned copy_size = old_size < new_size ? old_size : new_size;
      new_ptr = MALLOC( new_size );
-      
-      if( new_ptr && old_ptr ) {
-         memcpy( new_ptr, old_ptr, old_size );
+      if (new_ptr && old_ptr && copy_size) {
+         memcpy( new_ptr, old_ptr, copy_size );
      }
   }