Changeset 78794 in vbox for trunk

Timestamp:

May 27, 2019 7:11:12 PM (6 years ago)

Author:

vboxsync

Message:

HostServices/SharedOpenGL/crserverlib/server_getpixelmap.cpp: Error checking

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getpixelmap.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getpixelmap.cpp

@@ -15 +15 @@
 static GLint __sizeQuery( GLenum map )
 {
-    GLint get_values;
+    GLint get_values = 0;
     /* Windows compiler gets mad if variables might be uninitialized */
     GLenum newmap = GL_PIXEL_MAP_I_TO_I_SIZE;
@@ -80 +80 @@
 
         size *= tabsize;
-        local_values = (GLfloat*)crCalloc( size );
+        if (size)
+        {
+            local_values = (GLfloat*)crCalloc( size );
 
-        cr_server.head_spu->dispatch_table.GetPixelMapfv( map, local_values );
-        crServerReturnValue( local_values, size );
-        crFree( local_values );
+            cr_server.head_spu->dispatch_table.GetPixelMapfv( map, local_values );
+            crServerReturnValue( local_values, size );
+            crFree( local_values );
+        }
+        else
+        {
+            crError("crServerDispatchGetPixelMapfv: __sizeQuery() returned 0");
+            crServerReturnValue(NULL, 0);
+        }
     }
 }
@@ -107 +115 @@
 
         size *= tabsize;
-        local_values = (GLuint*)crCalloc( size );
+        if (size)
+        {
+            local_values = (GLuint*)crCalloc( size );
 
-        cr_server.head_spu->dispatch_table.GetPixelMapuiv( map, local_values );
-        crServerReturnValue( local_values, size );
-        crFree( local_values );
+            cr_server.head_spu->dispatch_table.GetPixelMapuiv( map, local_values );
+            crServerReturnValue( local_values, size );
+            crFree( local_values );
+        }
+        else
+        {
+            crError( "crServerDispatchGetPixelMapuiv: __sizeQuery() returned 0");
+            crServerReturnValue(NULL, 0);
+        }
     }
 }
@@ -134 +150 @@
 
         size *= tabsize;
-        local_values = (GLushort*)crCalloc( size );
+        if (size)
+        {
+            local_values = (GLushort*)crCalloc( size );
 
-        cr_server.head_spu->dispatch_table.GetPixelMapusv( map, local_values );
-        crServerReturnValue( local_values, size );
-        crFree( local_values );
+            cr_server.head_spu->dispatch_table.GetPixelMapusv( map, local_values );
+            crServerReturnValue( local_values, size );
+            crFree( local_values );
+        }
+        else
+        {
+            crError( "crServerDispatchGetPixelMapuiv: __sizeQuery() returned 0");
+            crServerReturnValue(NULL, 0);
+        }
     }
 }