1 files changed, 11 insertions, 0 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index cc39b048..6fb2643d 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -210,6 +210,17 @@ var LibraryGL = {
     },
 
     get: function(name_, p, type) {
+      // Guard against user passing a null pointer.
+      // Note that GLES2 spec does not say anything about how passing a null pointer should be treated.
+      // Testing on desktop core GL 3, the application crashes on glGetIntegerv to a null pointer, but
+      // better to report an error instead of doing anything random.
+      if (!p) {
+#if GL_ASSERTIONS
+        Module.printErr('GL_INVALID_VALUE in glGet' + type + 'v(name=' + name_ + ': Function called with null out pointer!');
+#endif
+        GL.recordError(0x0501 /* GL_INVALID_VALUE */);
+        return;
+      }
       var ret = undefined;
       switch(name_) { // Handle a few trivial GLES values
         case 0x8DFA: // GL_SHADER_COMPILER