diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 8a601d086..6db0bb79f 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -103,9 +103,12 @@ glamor_link_glsl_prog(ScreenPtr screen, GLint prog, const char *format, ...)
 
         glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size);
         info = malloc(size);
+        if (!info)
+            return FALSE;
 
         glGetProgramInfoLog(prog, size, NULL, info);
         ErrorF("Failed to link: %s\n", info);
+        free(info);
         return FALSE;
     }
     return TRUE;