state_pixel.c

Timestamp:

Oct 17, 2018 4:58:38 PM (6 years ago)

Author:

vboxsync

Message:

3D: Memory allocations fixed, bugref:9251. Merged changes r125768, r125779, r125780, r125812.

Location:

trunk

Files:

trunk

Property svn:mergeinfo

Property svn:mergeinfo

old	new
8	8	/branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
9	9	/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
10		/branches/VBox-5.2/src/VBox:120083,120099,120213,120221,120239,123597-123598,123600-123601,123755
	10	/branches/VBox-5.2/src/VBox:120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,125768,125779-125780,125812
11	11	/branches/andy/draganddrop/src/VBox:90781-91268
12	12	/branches/andy/guestctrl20/src/VBox:78916,78930

-              r70601
+              r74890
 void STATE_APIENTRY crStatePixelMapusv (GLenum map, GLint mapsize, const GLushort * values)
+{
+    GLfloat fvalues[CR_MAX_PIXEL_MAP_TABLE];
+    GLint i;
+    if (mapsize < 0 || mapsize > CR_MAX_PIXEL_MAP_TABLE)
+    {
+        crError("crStatePixelMapusv: parameter 'mapsize' is out of range");
+        return;
+    }
     if (!crStateIsBufferBound(GL_PIXEL_UNPACK_BUFFER_ARB))
+    {
+        GLfloat fvalues[CR_MAX_PIXEL_MAP_TABLE];
+        GLint i;
         if (map==GL_PIXEL_MAP_I_TO_I || map==GL_PIXEL_MAP_S_TO_S) {
            for (i=0;i<mapsize;i++) {

Note: See TracChangeset for help on using the changeset viewer.