diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 6e83a43ed..43d859d1f 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -63,11 +63,10 @@ glamor_compile_glsl_prog(GLenum type, const char *source)
     glCompileShader(prog);
     glGetShaderiv(prog, GL_COMPILE_STATUS, &ok);
     if (!ok) {
-        GLchar *info;
         GLint size;
 
         glGetShaderiv(prog, GL_INFO_LOG_LENGTH, &size);
-        info = malloc(size);
+        GLchar *info = calloc(1, size);
         if (info) {
             glGetShaderInfoLog(prog, size, NULL, info);
             ErrorF("Failed to compile %s: %s\n",
@@ -103,11 +102,10 @@ glamor_link_glsl_prog(ScreenPtr screen, GLint prog, const char *format, ...)
     glLinkProgram(prog);
     glGetProgramiv(prog, GL_LINK_STATUS, &ok);
     if (!ok) {
-        GLchar *info;
         GLint size;
 
         glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size);
-        info = malloc(size);
+        GLchar *info = calloc(1, size);
 
         glGetProgramInfoLog(prog, size, NULL, info);
         ErrorF("Failed to link: %s\n", info);
diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c
index 9b26180e9..42ae70b1d 100644
--- a/glamor/glamor_font.c
+++ b/glamor/glamor_font.c
@@ -51,7 +51,6 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
     unsigned char       c[2];
     CharInfoPtr         glyph;
     unsigned long       count;
-    char                *bits;
 
     if (!glamor_glsl_has_ints(glamor_priv))
         return NULL;
@@ -102,7 +101,7 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
         /* fallback if we don't fit inside a texture */
         return NULL;
     }
-    bits = malloc(overall_width * overall_height);
+    char *bits = calloc(overall_width, overall_height);
     if (!bits)
         return NULL;