Verify the texture buffer for tex_image_2d() call.

JerryShih · JerryShih · commit 32632b23d7b6 · 2017-06-02T16:54:29.000+08:00
diff --git a/src/gl_fns.rs b/src/gl_fns.rs
@@ -342,7 +342,6 @@ impl Gl for GlFns {
         }
     }
 
-    // FIXME: Does not verify buffer size -- unsafe!
     fn tex_image_2d(&self,
                     target: GLenum,
                     level: GLint,
@@ -353,19 +352,18 @@ impl Gl for GlFns {
                     format: GLenum,
                     ty: GLenum,
                     opt_data: Option<&[u8]>) {
-        match opt_data {
-            Some(data) => {
+        if let Some(data) = opt_data {
+            if !data.is_empty() {
                 unsafe {
                     self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
                                             data.as_ptr() as *const GLvoid);
                 }
+                return;
             }
-            None => {
-                unsafe {
-                    self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
-                                            ptr::null());
-                }
-            }
+        }
+        unsafe {
+            self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
+                                    ptr::null());
         }
     }
 
diff --git a/src/gles_fns.rs b/src/gles_fns.rs
@@ -320,7 +320,6 @@ impl Gl for GlesFns {
         }
     }
 
-    // FIXME: Does not verify buffer size -- unsafe!
     fn tex_image_2d(&self,
                     target: GLenum,
                     level: GLint,
@@ -331,19 +330,18 @@ impl Gl for GlesFns {
                     format: GLenum,
                     ty: GLenum,
                     opt_data: Option<&[u8]>) {
-        match opt_data {
-            Some(data) => {
+        if let Some(data) = opt_data {
+            if !data.is_empty() {
                 unsafe {
                     self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
                                             data.as_ptr() as *const GLvoid);
                 }
+                return;
             }
-            None => {
-                unsafe {
-                    self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
-                                            ptr::null());
-                }
-            }
+        }
+        unsafe {
+            self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,
+                                    ptr::null());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,6 @@ impl Gl for GlFns {`
`342`	`342`	`}`
`343`	`343`	`}`
`344`	`344`
`345`		`- // FIXME: Does not verify buffer size -- unsafe!`
`346`	`345`	`fn tex_image_2d(&self,`
`347`	`346`	`target: GLenum,`
`348`	`347`	`level: GLint,`
`@@ -353,19 +352,18 @@ impl Gl for GlFns {`
`353`	`352`	`format: GLenum,`
`354`	`353`	`ty: GLenum,`
`355`	`354`	`opt_data: Option<&[u8]>) {`
`356`		`- match opt_data {`
`357`		`- Some(data) => {`
	`355`	`+ if let Some(data) = opt_data {`
	`356`	`+ if !data.is_empty() {`
`358`	`357`	`unsafe {`
`359`	`358`	`self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,`
`360`	`359`	`data.as_ptr() as *const GLvoid);`
`361`	`360`	`}`
	`361`	`+ return;`
`362`	`362`	`}`
`363`		`- None => {`
`364`		`- unsafe {`
`365`		`- self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,`
`366`		`- ptr::null());`
`367`		`- }`
`368`		`- }`
	`363`	`+ }`
	`364`	`+ unsafe {`
	`365`	`+ self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,`
	`366`	`+ ptr::null());`
`369`	`367`	`}`
`370`	`368`	`}`
`371`	`369`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,6 @@ impl Gl for GlesFns {`
`320`	`320`	`}`
`321`	`321`	`}`
`322`	`322`
`323`		`- // FIXME: Does not verify buffer size -- unsafe!`
`324`	`323`	`fn tex_image_2d(&self,`
`325`	`324`	`target: GLenum,`
`326`	`325`	`level: GLint,`
`@@ -331,19 +330,18 @@ impl Gl for GlesFns {`
`331`	`330`	`format: GLenum,`
`332`	`331`	`ty: GLenum,`
`333`	`332`	`opt_data: Option<&[u8]>) {`
`334`		`- match opt_data {`
`335`		`- Some(data) => {`
	`333`	`+ if let Some(data) = opt_data {`
	`334`	`+ if !data.is_empty() {`
`336`	`335`	`unsafe {`
`337`	`336`	`self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,`
`338`	`337`	`data.as_ptr() as *const GLvoid);`
`339`	`338`	`}`
	`339`	`+ return;`
`340`	`340`	`}`
`341`		`- None => {`
`342`		`- unsafe {`
`343`		`- self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,`
`344`		`- ptr::null());`
`345`		`- }`
`346`		`- }`
	`341`	`+ }`
	`342`	`+ unsafe {`
	`343`	`+ self.ffi_gl_.TexImage2D(target, level, internal_format, width, height, border, format, ty,`
	`344`	`+ ptr::null());`
`347`	`345`	`}`
`348`	`346`	`}`
`349`	`347`