Changeset 78212 in vbox for trunk/src

Timestamp:

Apr 18, 2019 9:39:13 PM (6 years ago)

Author:

vboxsync

Message:

HostServices/ShareOpenGL/unpacker: Verification fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/unpacker

Files:

• unpack_calllists.cpp (modified) (1 diff)
• unpack_pixelmap.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_calllists.cpp

@@ -9 +9 @@
 void crUnpackCallLists(PCrUnpackerState pState)
 {
-    CHECK_BUFFER_SIZE_STATIC_LAST(pState, 4, GLenum);
+    CHECK_BUFFER_SIZE_STATIC_LAST(pState, sizeof( int ) + 4, GLenum);
 
     GLint n = READ_DATA(pState, sizeof( int ) + 0, GLint );

trunk/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_pixelmap.cpp

@@ -23 +23 @@
     {
         /* This is valid, see glPixelMap description for GL_PIXEL_UNPACK_BUFFER values is treated as a byte offset. */
+        CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof( int ) + 12, GLfloat);
         values = (GLfloat*) (uintptr_t) READ_DATA(pState,sizeof(int) + 12, GLint);
     }
     else
     {
+        CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof( int ) + 16, GLfloat);
+
         values = DATA_POINTER(pState, sizeof( int ) + 16, GLfloat );
         CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, values, mapsize, GLfloat);
@@ -50 +53 @@
     {
         /* This is valid, see glPixelMap description for GL_PIXEL_UNPACK_BUFFER values is treated as a byte offset. */
+        CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof( int ) + 12, GLfloat);
         values = (GLuint*) (uintptr_t) READ_DATA(pState,sizeof(int) + 12, GLint);
     }
     else
     {
+        CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof( int ) + 16, GLfloat);
+
         values = DATA_POINTER(pState, sizeof( int ) + 16, GLuint );
         CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, values, mapsize, GLuint);
@@ -77 +83 @@
     {
         /* This is valid, see glPixelMap description for GL_PIXEL_UNPACK_BUFFER values is treated as a byte offset. */
+        CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof( int ) + 12, GLfloat);
         values = (GLushort*) (uintptr_t) READ_DATA(pState, sizeof(int) + 12, GLint);
     }
     else
     {
+        CHECK_BUFFER_SIZE_STATIC_UPDATE_LAST(pState, sizeof( int ) + 16, GLfloat);
+
         values = DATA_POINTER(pState, sizeof( int ) + 16, GLushort );
         CHECK_ARRAY_SIZE_FROM_PTR_UPDATE_LAST(pState, values, mapsize, GLushort);