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

Timestamp:

Apr 10, 2019 8:01:12 PM (6 years ago)

Author:

vboxsync

Message:

GuestHost/OpenGL,HostServices/SharedOpenGL: Updates bugref:9407

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• presenter/server_presenter.cpp (modified) (1 diff)
• server_get.py (modified) (2 diffs)
• server_getpixelmap.c (modified) (3 diffs)
• server_getshaders.c (modified) (2 diffs)
• server_glsl.c (modified) (2 diffs)
• server_papi.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.cpp

@@ -146 +146 @@
 static int8_t crFbImgFromDimOffVramBGRA(VBOXCMDVBVAOFFSET offVRAM, uint32_t width, uint32_t height, CR_BLITTER_IMG *pImg)
 {
-    uint32_t cbBuff = width * height * 4;
+    uint32_t cbBuff;
+    
+    if (width == 0 || height == 0)
+    {
+        WARN(("invalid param"));
+        return -1;
+    }
+    
+    cbBuff = width * height * 4;
+    // Check if overflow happened
+    if (cbBuff / width != height * 4)
+    {
+        WARN(("invalid param"));
+        return -1;
+    }
+    
     if (offVRAM >= g_cbVRam
+            || UINT32_MAX - cbBuff <= offVRAM
             || offVRAM + cbBuff >= g_cbVRam)
     {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_get.py

@@ -49 +49 @@
     'GetProgramParameterfvNV': 4,
     'GetProgramivNV': 1,
-    'GetTrackMatrixivNV': 1,
+    'GetTrackMatrixivNV': 24,
     'GetVertexAttribPointervNV': 1,
     'GetVertexAttribdvNV': 4,
@@ -127 +127 @@
         local_argname = 'local_%s' % lastParam[0]
 
-        print('\tunsigned int cComponents = 0;');
+        if not func_name in no_pnames:
+            print('\tunsigned int cComponents = 0;');
         print('\t%s %s[%d] = { 0 };' % ( local_argtype, local_argname, max_components[func_name] ))
         print('\t(void) %s;' % lastParam[0])

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

@@ -80 +80 @@
 
         size *= tabsize;
-        local_values = (GLfloat*)crAlloc( size );
+        local_values = (GLfloat*)crCalloc( size );
 
         cr_server.head_spu->dispatch_table.GetPixelMapfv( map, local_values );
@@ -107 +107 @@
 
         size *= tabsize;
-        local_values = (GLuint*)crAlloc( size );
+        local_values = (GLuint*)crCalloc( size );
 
         cr_server.head_spu->dispatch_table.GetPixelMapuiv( map, local_values );
@@ -134 +134 @@
 
         size *= tabsize;
-        local_values = (GLushort*)crAlloc( size );
+        local_values = (GLushort*)crCalloc( size );
 
         cr_server.head_spu->dispatch_table.GetPixelMapusv( map, local_values );

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

@@ -359 +359 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetObjectParameterfvARB( VBoxGLhandleARB obj, GLenum pname, GLfloat * params )
 {
-    GLfloat local_params[1];
+    GLfloat local_params[1] = {0};
     GLuint hwid = crStateGetProgramHWID(obj);
     (void) params;
@@ -378 +378 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetObjectParameterivARB( VBoxGLhandleARB obj, GLenum pname, GLint * params )
 {
-    GLint local_params[1];
+    GLint local_params[1] = {0};
     GLuint hwid = crStateGetProgramHWID(obj);
     if (!hwid)

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

@@ -151 +151 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetProgramiv( GLuint program, GLenum pname, GLint * params )
 {
-    GLint local_params[1];
+    GLint local_params[1] = {0};
     (void) params;
     cr_server.head_spu->dispatch_table.GetProgramiv(crStateGetProgramHWID(program), pname, local_params);
@@ -159 +159 @@
 void SERVER_DISPATCH_APIENTRY crServerDispatchGetShaderiv( GLuint shader, GLenum pname, GLint * params )
 {
-    GLint local_params[1];
+    GLint local_params[1] = {0};
     (void) params;
     cr_server.head_spu->dispatch_table.GetShaderiv( crStateGetShaderHWID(shader), pname, local_params );

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

@@ -32 +32 @@
         cr_server.head_spu->dispatch_table.ChromiumParametervCR( GL_PRINT_STRING_CR, GL_UNSIGNED_BYTE, sizeof(debug_buf), debug_buf );
 #endif
+
+        if (count > CR_MAX_CLIENTS)
+                count = CR_MAX_CLIENTS;
+
         if (count == 0)
         {