Changeset 40479 in vbox for trunk

Timestamp:

Mar 15, 2012 2:16:50 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: build log bugfix

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu_getshaders.c (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_getshaders.c (modified) (5 diffs)

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

@@ -22 +22 @@
 #include "packspu_proto.h"
 #include "cr_mem.h"
+#include <iprt/assert.h>
 
 /*@todo combine with the one from server_getshaders.c*/
@@ -123 +124 @@
 }
 
+AssertCompile(sizeof(GLsizei) == 4);
+
 void PACKSPU_APIENTRY packspu_GetInfoLogARB(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog)
 {
@@ -140 +143 @@
         crNetRecv();
 
-    if (length) *length=*pLocal;
-    crMemcpy(infoLog, &pLocal[1], (*pLocal)+1);
+    CRASSERT((pLocal[0]) <= maxLength);
+
+    if (length) *length=*pLocal;
+    crMemcpy(infoLog, &pLocal[1], (maxLength >= (pLocal[0])) ? pLocal[0] : maxLength);
     crFree(pLocal);
 }

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

@@ -25 +25 @@
 #include "server.h"
 
+#include <iprt/assert.h>
+
 #ifdef CR_OPENGL_VERSION_2_0
 
@@ -114 +116 @@
 }
 
+AssertCompile(sizeof(GLsizei) == 4);
+
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetInfoLogARB(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog)
 {
@@ -129 +133 @@
     if (!hwid) hwid = crStateGetShaderHWID(obj);
     cr_server.head_spu->dispatch_table.GetInfoLogARB(hwid, maxLength, pLocal, (char*)&pLocal[1]);
+    CRASSERT((*pLocal) <= maxLength);
     crServerReturnValue(pLocal, (*pLocal)+sizeof(GLsizei));
     crFree(pLocal);
@@ -159 +164 @@
     }
     cr_server.head_spu->dispatch_table.GetProgramInfoLog(crStateGetProgramHWID(program), bufSize, pLocal, (char*)&pLocal[1]);
+    CRASSERT(pLocal[0] <= bufSize);
     crServerReturnValue(pLocal, pLocal[0]+sizeof(GLsizei));
     crFree(pLocal);
@@ -174 +180 @@
     }
     cr_server.head_spu->dispatch_table.GetShaderSource(crStateGetShaderHWID(shader), bufSize, pLocal, (char*)&pLocal[1]);
+    CRASSERT(pLocal[0] <= bufSize);
     crServerReturnValue(pLocal, pLocal[0]+sizeof(GLsizei));
     crFree(pLocal);