summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Phillips <jp.sittingduck@gmail.com>2010-10-08 19:10:05 +0100
committerJulien Danjou <julien@danjou.info>2010-10-12 11:31:02 +0200
commit023fdd2e06e4a5d2295830eec563cedd07b60bbb (patch)
treed71b9007a06dc34f3d0088039925120f03bd697b
parent9b18dc87b29427f6bca492cd279a2b2f74e2638a (diff)
Check for malloc failure in two places.HEADmaster
In xcb_key_symbols_alloc. In xcb_render_util_composite_text_stream. Signed-off-by: Julien Danjou <julien@danjou.info>
-rw-r--r--keysyms/keysyms.c2
-rw-r--r--renderutil/glyph.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/keysyms/keysyms.c b/keysyms/keysyms.c
index c3e7f2e..062424c 100644
--- a/keysyms/keysyms.c
+++ b/keysyms/keysyms.c
@@ -81,6 +81,8 @@ xcb_key_symbols_alloc (xcb_connection_t *c)
return NULL;
syms = malloc (sizeof (xcb_key_symbols_t));
+ if (!syms)
+ return NULL;
syms->c = c;
syms->tag = TAG_COOKIE;
diff --git a/renderutil/glyph.c b/renderutil/glyph.c
index 1721cad..4996202 100644
--- a/renderutil/glyph.c
+++ b/renderutil/glyph.c
@@ -66,6 +66,8 @@ xcb_render_util_composite_text_stream (
}
stream = malloc(sizeof(xcb_render_util_composite_text_stream_t));
+ if (!stream)
+ return NULL;
stream->glyph_size = 0;
stream->initial_glyphset = initial_glyphset;