From bf62f009f8521bde54402cc9e5d22eb133b53e62 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 26 Mar 2002 00:36:44 +0000
Subject: [PATCH] more robust error message handling

---
 panda/src/glgsg/glGraphicsStateGuardian.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/panda/src/glgsg/glGraphicsStateGuardian.cxx b/panda/src/glgsg/glGraphicsStateGuardian.cxx
index ae682648f0..206850be85 100644
--- a/panda/src/glgsg/glGraphicsStateGuardian.cxx
+++ b/panda/src/glgsg/glGraphicsStateGuardian.cxx
@@ -3937,7 +3937,13 @@ void report_errors_loop(GLenum error_code) {
 #define MAXGLERRORSREPORTED 20
   int cnt=0;
   while ((cnt<MAXGLERRORSREPORTED) && (error_code != GL_NO_ERROR)) {
-    glgsg_cat.error() << gluErrorString(error_code) << "\n";
+    const GLubyte *error_string = gluErrorString(error_code);
+    if (error_string != (const GLubyte *)NULL) {
+      glgsg_cat.error() << error_string << "\n";
+    } else {
+      glgsg_cat.error()
+        << "Error number " << (int)error_code << "; no string available.\n";
+    }
     error_code = glGetError();
     cnt++;
   }