glfw: update setIcon hotfix for undefined behavior

See glfw/glfw#1986 Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
hexops · Nov 16, 2021 · b967fd5 · b967fd5
1 parent de499c2
commit b967fd5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/upstream/glfw/src/x11_window.c b/upstream/glfw/src/x11_window.c
@@ -2123,8 +2123,8 @@ void _glfwPlatformSetWindowIcon(_GLFWwindow* window,
         for (i = 0;  i < count;  i++)
             longCount += 2 + images[i].width * images[i].height;
 
-        long* icon = calloc(longCount, sizeof(long));
-        long* target = icon;
+        unsigned long* icon = calloc(longCount, sizeof(unsigned long));
+        unsigned long* target = icon;
 
         for (i = 0;  i < count;  i++)
         {
@@ -2133,10 +2133,10 @@ void _glfwPlatformSetWindowIcon(_GLFWwindow* window,
 
             for (j = 0;  j < images[i].width * images[i].height;  j++)
             {
-                *target++ = (((long)images[i].pixels[j * 4 + 0]) << 16) |
-                            (((long)images[i].pixels[j * 4 + 1]) <<  8) |
-                            (((long)images[i].pixels[j * 4 + 2]) <<  0) |
-                            (((long)images[i].pixels[j * 4 + 3]) << 24);
+                *target++ = (((unsigned long)images[i].pixels[j * 4 + 0]) << 16) |
+                            (((unsigned long)images[i].pixels[j * 4 + 1]) <<  8) |
+                            (((unsigned long)images[i].pixels[j * 4 + 2]) <<  0) |
+                            (((unsigned long)images[i].pixels[j * 4 + 3]) << 24);
             }
         }