Merge https://github.com/nigels-com/glew.git into master HEAD at Thu Jan 7 17:44:14 GMT 2016

auto/src/glew_head.c

@@ -10,7 +10,7 @@
 #endif
 
 #include <stddef.h>  /* For size_t */
-#include <stdlib.h>  /* For malloc, free */
+#include <stdlib.h>  /* For bsearch */
 #include <string.h>  /* For memset */
 
 #if defined(GLEW_REGAL)
@@ -65,7 +65,7 @@ void* NSGLGetProcAddress (const GLubyte *name)
 {
   static void* image = NULL;
   void* addr;
-  if (NULL == image) 
+  if (NULL == image)
   {
     image = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY);
   }
@@ -166,25 +166,19 @@ static GLuint _glewStrCLen (const GLubyte* s, GLubyte c)
   GLuint i=0;
   if (s == NULL) return 0;
   while (s[i] != '\0' && s[i] != c) i++;
-  return (s[i] == '\0' || s[i] == c) ? i : 0;
+  return i;
 }
 
-static GLubyte *_glewStrDup (const GLubyte *s)
+static GLuint _glewStrCopy(char *d, const char *s, char c)
 {
-    int n = _glewStrLen(s);
+  GLuint i=0;
-    GLubyte *dup = malloc(n+1);
+  if (s == NULL) return 0;
-    if (dup)
+  while (s[i] != '\0' && s[i] != c) { d[i] = s[i]; i++; }
-    {
+  d[i] = '\0';
-        GLubyte *i = dup;
+  return i;
-        for (;;)
-        {
-            *i = *s;
-            if (*i) { ++i; ++s; } else break;
-        }
-    }
-    return dup;
 }
 
+#if !defined(GLEW_OSMESA)
 #if !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
 {
@@ -195,6 +189,7 @@ static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
   return i == n ? GL_TRUE : GL_FALSE;
 }
 #endif
+#endif
 
 static GLboolean _glewStrSame1 (const GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
 {
@@ -255,6 +250,7 @@ static GLboolean _glewStrSame3 (const GLubyte** a, GLuint* na, const GLubyte* b,
  * other extension names. Could use strtok() but the constant
  * string returned by glGetString might be in read-only memory.
  */
+#if !defined(GLEW_OSMESA)
 #if !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
 static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, const GLubyte *end)
 {
@@ -270,3 +266,4 @@ static GLboolean _glewSearchExtension (const char* name, const GLubyte *start, c
   return GL_FALSE;
 }
 #endif
+#endif

auto/src/glew_init_gl.c

@@ -2,13 +2,25 @@
 
 static int _glewExtensionCompare(const void *a, const void *b)
 {
-   return strcmp((const char *) a, *(const char * const *) b);
+  /* http://www.chanduthedev.com/2012/07/strcmp-implementation-in-c.html */
+  const char *s1 = (const char *) a;
+  const char *s2 = *(const char * const *) b;
+  while (*s1 || *s2)
+  {
+      if (*s1 > *s2)
+          return 1;
+      if (*s1 < *s2)
+          return -1;
+      s1++;
+      s2++;
+  }
+  return 0;
 }
 
 static GLboolean *_glewGetExtensionString(const char *name)
 {
   const char **n = (const char **) bsearch(name, _glewExtensionLookup, sizeof(_glewExtensionLookup)/sizeof(char *)-1, sizeof(char *), _glewExtensionCompare);
-  int i;
+  ptrdiff_t i;
 
   if (n)
   {
@@ -22,7 +34,7 @@ static GLboolean *_glewGetExtensionString(const char *name)
 static GLboolean *_glewGetExtensionEnable(const char *name)
 {
   const char **n = (const char **) bsearch(name, _glewExtensionLookup, sizeof(_glewExtensionLookup)/sizeof(char *)-1, sizeof(char *), _glewExtensionCompare);
-  int i;
+  ptrdiff_t i;
 
   if (n)
   {
@@ -33,17 +45,17 @@ static GLboolean *_glewGetExtensionEnable(const char *name)
   return NULL;
 }
 
-static char *_glewNextSpace(char *i)
+static const char *_glewNextSpace(const char *i)
 {
-  char *j = i;
+  const char *j = i;
   if (j)
     while (*j!=' ' && *j) ++j;
   return j;
 }
 
-static char *_glewNextNonSpace(char *i)
+static const char *_glewNextNonSpace(const char *i)
 {
-  char *j = i;
+  const char *j = i;
   if (j)
     while (*j==' ') ++j;
   return j;
@@ -70,7 +82,7 @@ static GLenum GLEWAPIENTRY glewContextInit ()
   dot = _glewStrCLen(s, '.');
   if (dot == 0)
     return GLEW_ERROR_NO_GL_VERSION;
-  
+
   major = s[dot-1]-'0';
   minor = s[dot+1]-'0';
 
@@ -78,7 +90,7 @@ static GLenum GLEWAPIENTRY glewContextInit ()
     minor = 0;
   if (major<0 || major>9)
     return GLEW_ERROR_NO_GL_VERSION;
-  
+
   if (major == 1 && minor == 0)
   {
     return GLEW_ERROR_GL_VERSION_10_ONLY;
@@ -95,12 +107,12 @@ static GLenum GLEWAPIENTRY glewContextInit ()
     GLEW_VERSION_3_2   = GLEW_VERSION_3_3   == GL_TRUE || ( major == 3 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_3_1   = GLEW_VERSION_3_2   == GL_TRUE || ( major == 3 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_3_0   = GLEW_VERSION_3_1   == GL_TRUE || ( major == 3               ) ? GL_TRUE : GL_FALSE;
-    GLEW_VERSION_2_1   = GLEW_VERSION_3_0   == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;    
+    GLEW_VERSION_2_1   = GLEW_VERSION_3_0   == GL_TRUE || ( major == 2 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_2_0   = GLEW_VERSION_2_1   == GL_TRUE || ( major == 2               ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_1_5   = GLEW_VERSION_2_0   == GL_TRUE || ( major == 1 && minor >= 5 ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_1_4   = GLEW_VERSION_1_5   == GL_TRUE || ( major == 1 && minor >= 4 ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_1_3   = GLEW_VERSION_1_4   == GL_TRUE || ( major == 1 && minor >= 3 ) ? GL_TRUE : GL_FALSE;
-    GLEW_VERSION_1_2_1 = GLEW_VERSION_1_3   == GL_TRUE                                 ? GL_TRUE : GL_FALSE; 
+    GLEW_VERSION_1_2_1 = GLEW_VERSION_1_3   == GL_TRUE                                 ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_1_2   = GLEW_VERSION_1_2_1 == GL_TRUE || ( major == 1 && minor >= 2 ) ? GL_TRUE : GL_FALSE;
     GLEW_VERSION_1_1   = GLEW_VERSION_1_2   == GL_TRUE || ( major == 1 && minor >= 1 ) ? GL_TRUE : GL_FALSE;
   }
@@ -137,35 +149,37 @@ static GLenum GLEWAPIENTRY glewContextInit ()
   }
   else
   {
-    const GLubyte *ext;
+    const char *extensions;
-    char *begin;
+    const char *end;
-    char *end;
+    const char *i;
-    char *i;
+    const char *j;
-    char *j;
+    char ext[128];
     GLboolean *enable;
 
-    ext = glGetString(GL_EXTENSIONS);
+    extensions = (const char *) glGetString(GL_EXTENSIONS);
 
-    if (ext)
+    if (extensions)
     {
-      begin = (char *) _glewStrDup(ext);
+      end = extensions + _glewStrLen((const GLubyte *) extensions);
-      end = begin + _glewStrLen((GLubyte *) begin);
+      for (i=extensions; i<end; i = j + 1)
-      for (i=begin; i<end; i = j + 1)
       {
         i = _glewNextNonSpace(i);
         j = _glewNextSpace(i);
-        *j = 0;
+
+        /* Copy extension into NUL terminated string */
+        if (j-i >= (ptrdiff_t) sizeof(ext))
+          continue;
+        _glewStrCopy(ext, i, ' ');
 
         /* Based on extension string(s), glewGetExtension purposes */
-        enable = _glewGetExtensionString(i);
+        enable = _glewGetExtensionString(ext);
         if (enable)
           *enable = GL_TRUE;
 
         /* Based on extension string(s), experimental mode, glewIsSupported purposes */
-        enable = _glewGetExtensionEnable(i);
+        enable = _glewGetExtensionEnable(ext);
         if (enable)
           *enable = GL_TRUE;
       }
-      free(begin);
     }
   }

config/Makefile.linux

@@ -25,6 +25,7 @@ POPT = -O2
 CFLAGS.EXTRA += -fPIC
 CFLAGS.EXTRA += -Wcast-qual
 CFLAGS.EXTRA += -ansi -pedantic
+CFLAGS.EXTRA += -fno-stack-protector
 BIN.SUFFIX =
 LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
 LIB.DEVLNK = lib$(NAME).so

config/Makefile.linux-clang

@@ -25,6 +25,7 @@ POPT = -O2
 CFLAGS.EXTRA += -fPIC
 CFLAGS.EXTRA += -Wcast-qual
 CFLAGS.EXTRA += -ansi -pedantic
+CFLAGS.EXTRA += -fno-stack-protector
 BIN.SUFFIX =
 LIB.SONAME = lib$(NAME).so.$(SO_MAJOR)
 LIB.DEVLNK = lib$(NAME).so