Changeset 33045 in vbox

Timestamp:

Oct 11, 2010 4:57:21 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: fix GetObjectParameter[if]v accessing invalid shaders/programs

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu_getshaders.c (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_getshaders.c (modified) (4 diffs)
• HostServices/SharedOpenGL/crserverlib/server_special (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c

@@ -163 +163 @@
 
     if (length) *length=*pLocal;
-    crMemcpy(infoLog, &pLocal[1], (*pLocal)+1);
+    crMemcpy(infoLog, &pLocal[1], (bufSize >= pLocal[0]) ? pLocal[0] : bufSize);
     crFree(pLocal);
 }
@@ -185 +185 @@
 
     if (length) *length=*pLocal;
-    crMemcpy(infoLog, &pLocal[1], (*pLocal)+1);
+    crMemcpy(infoLog, &pLocal[1], (bufSize >= pLocal[0]) ? pLocal[0] : bufSize);
     crFree(pLocal);
 }
@@ -207 +207 @@
 
     if (length) *length=*pLocal;
-    crMemcpy(source, &pLocal[1], (*pLocal)+1);
-    crFree(pLocal);
-}
+    crMemcpy(source, &pLocal[1], (bufSize >= pLocal[0]) ? pLocal[0] : bufSize);
+    crFree(pLocal);
+}

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

@@ -144 +144 @@
     }
     cr_server.head_spu->dispatch_table.GetShaderInfoLog(crStateGetShaderHWID(shader), bufSize, pLocal, (char*)&pLocal[1]);
-    crServerReturnValue(pLocal, (*pLocal)+1+sizeof(GLsizei));
+    crServerReturnValue(pLocal, pLocal[0]+sizeof(GLsizei));
     crFree(pLocal);
 }
@@ -159 +159 @@
     }
     cr_server.head_spu->dispatch_table.GetProgramInfoLog(crStateGetProgramHWID(program), bufSize, pLocal, (char*)&pLocal[1]);
-    crServerReturnValue(pLocal, (*pLocal)+1+sizeof(GLsizei));
+    crServerReturnValue(pLocal, pLocal[0]+sizeof(GLsizei));
     crFree(pLocal);
 }
@@ -174 +174 @@
     }
     cr_server.head_spu->dispatch_table.GetShaderSource(crStateGetShaderHWID(shader), bufSize, pLocal, (char*)&pLocal[1]);
-    crServerReturnValue(pLocal, (*pLocal)+1+sizeof(GLsizei));
+    crServerReturnValue(pLocal, pLocal[0]+sizeof(GLsizei));
     crFree(pLocal);
 }
@@ -280 +280 @@
 }
 
+void SERVER_DISPATCH_APIENTRY crServerDispatchGetObjectParameterfvARB( GLhandleARB obj, GLenum pname, GLfloat * params )
+{
+    GLfloat local_params[1];
+    GLuint hwid = crStateGetProgramHWID(obj);
+    (void) params;
+
+    if (!hwid)
+    {
+        hwid = crStateGetShaderHWID(obj);
+        if (!hwid)
+        {
+            crWarning("Unknown object %i, in crServerDispatchGetObjectParameterfvARB", obj);
+        }
+    }
+
+    cr_server.head_spu->dispatch_table.GetObjectParameterfvARB( hwid, pname, local_params );
+    crServerReturnValue( &(local_params[0]), 1*sizeof(GLfloat) );
+}
+
+void SERVER_DISPATCH_APIENTRY crServerDispatchGetObjectParameterivARB( GLhandleARB obj, GLenum pname, GLint * params )
+{
+    GLint local_params[1];
+    GLuint hwid = crStateGetProgramHWID(obj);
+    if (!hwid)
+    {
+        hwid = crStateGetShaderHWID(obj);
+        if (!hwid)
+        {
+            crWarning("Unknown object %i, in crServerDispatchGetObjectParameterivARB", obj);
+        }
+    }
+
+    (void) params;
+    cr_server.head_spu->dispatch_table.GetObjectParameterivARB( hwid, pname, local_params );
+    crServerReturnValue( &(local_params[0]), 1*sizeof(GLint) );
+}
 #endif /* #ifdef CR_OPENGL_VERSION_2_0 */

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_special

@@ -243 +243 @@
 GetUniformLocation
 CopyTexSubImage2D
+GetObjectParameterivARB
+GetObjectParameterfvARB