소스 검색

LP bug 992049: patch from Andrew Wason

Andrew Wason 13 년 전
부모
커밋
4ced98fae9
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      panda/src/glstuff/glShaderContext_src.cxx

+ 2 - 2
panda/src/glstuff/glShaderContext_src.cxx

@@ -1103,14 +1103,14 @@ glsl_report_shader_errors(GSG *gsg, unsigned int shader) {
 
 
   gsg->_glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
   gsg->_glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
 
 
-  if (length > 0) {
+  if (length > 1) {
     info_log = (char *) malloc(length);
     info_log = (char *) malloc(length);
     gsg->_glGetShaderInfoLog(shader, length, &num_chars, info_log);
     gsg->_glGetShaderInfoLog(shader, length, &num_chars, info_log);
     if (strcmp(info_log, "Success.\n") != 0) {
     if (strcmp(info_log, "Success.\n") != 0) {
       GLCAT.error(false) << info_log << "\n";
       GLCAT.error(false) << info_log << "\n";
     }
     }
+    free(info_log);
   }
   }
-  delete[] info_log;
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////