Changeset 21854 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jul 28, 2009 3:55:07 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: ignore gldrawpixels with incorrect type/format

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• packer/pack_pixels.c (modified) (2 diffs)
• util/pixel.c (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/packer/pack_pixels.c

@@ -18 +18 @@
 {
     unsigned char *data_ptr;
-    int packet_length;
+    int packet_length, imagesize;
 
     if (pixels == NULL)
@@ -40 +40 @@
         sizeof( type );
 
-    packet_length += crImageSize( format, type, width, height );
+    imagesize = crImageSize( format, type, width, height );
+
+    if (imagesize<=0)
+    {
+        crDebug("crPackDrawPixels: 0 image size, ignoring");
+        return;
+    }
+
+    packet_length += imagesize;
 
     data_ptr = (unsigned char *) crPackAlloc( packet_length );

trunk/src/VBox/GuestHost/OpenGL/util/pixel.c

@@ -102 +102 @@
             break;
         default:
-            /*
-            crError( "Unknown pixel type in crPixelSize: 0x%x", (unsigned int) type );
-            */
-            return -1;
+            crWarning( "Unknown pixel type in crPixelSize: type:0x%x(fmt:0x%x)", (unsigned int) type, (unsigned int) format);
+            return 0;
     }
 
@@ -138 +136 @@
             break;
         default:
-            /*
-            crError( "Unknown pixel format in crPixelSize: 0x%x", (unsigned int) format );
-            */
-            return -1;
+            crWarning( "Unknown pixel format in crPixelSize: type:0x%x(fmt:0x%x)", (unsigned int) type, (unsigned int) format);
+            return 0;
     }