Changeset 70601 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Jan 16, 2018 4:26:58 PM (7 years ago)

Author:

vboxsync

Message:

3D: SharedOpenGL code cleanup, bugref:9043

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_glsl.c (modified) (1 diff)
• server_lists.c (modified) (1 diff)
• server_texture.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c

@@ -179 +179 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteProgramsARB(GLsizei n, const GLuint * programs)
 {
-    GLuint *pLocalProgs = (GLuint *) crAlloc(n * sizeof(GLuint));
+    GLuint *pLocalProgs;
     GLint i;
+
+    if (n >= UINT32_MAX / sizeof(GLuint))
+    {
+        crError("crServerDispatchDeleteProgramsARB: parameter 'n' is out of range");
+        return;
+    }
+
+    pLocalProgs = (GLuint *)crAlloc(n * sizeof(GLuint));
+
     if (!pLocalProgs) {
         crError("crServerDispatchDeleteProgramsARB: out of memory");

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_lists.c

@@ -230 +230 @@
 crServerDispatchCallLists( GLsizei n, GLenum type, const GLvoid *lists )
 {
+    if (n >= UINT32_MAX / sizeof(GLuint))
+    {
+        crError("crServerDispatchCallLists: parameter 'n' is out of range");
+        return;
+    }
+
 #ifndef VBOX_WITH_CR_DISPLAY_LISTS
     if (!cr_server.sharedDisplayLists) {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_texture.c

@@ -200 +200 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchDeleteTextures( GLsizei n, const GLuint *textures)
 {
-    GLuint *newTextures = (GLuint *) crAlloc(n * sizeof(GLuint));
+    GLuint *newTextures;
     GLint i;
+
+    if (n >= UINT32_MAX / sizeof(GLuint))
+    {
+        crError("crServerDispatchDeleteTextures: parameter 'n' is out of range");
+        return;
+    }
+
+    newTextures = (GLuint *)crAlloc(n * sizeof(GLuint));
 
     if (!newTextures)