Changeset 40479 in vbox for trunk/src/VBox/Additions/common

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: build log bugfix

File:

• trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c (modified) (3 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);
 }