From 3df70b7320963a3615a7d09641b4b0071820724d Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Wed, 30 May 2012 16:05:37 -0700
Subject: [PATCH] Bug 746740 - GetProgramInfoLog should return null on GL error
 - r=bjacob

---
 content/canvas/src/WebGLContextGL.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/content/canvas/src/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp
index c29133119bbf..a46f4ee0c951 100644
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -3024,8 +3024,10 @@ WebGLContext::GetProgramInfoLog(WebGLProgram *prog, nsACString& retval,
     GLint k = -1;
     gl->fGetProgramiv(progname, LOCAL_GL_INFO_LOG_LENGTH, &k);
     if (k == -1) {
-        // XXX GL error? shouldn't happen!
-        rv = NS_ERROR_FAILURE;
+        // If GetProgramiv doesn't modify |k|,
+        // it's because there was a GL error.
+        // GetProgramInfoLog should return null on error. (Bug 746740)
+        retval.SetIsVoid(true);
         return;
     }