projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
93331ff
)
Don't create buffer from NULL pointer
author
Tim Wiederhake
<twied@gmx.net>
Thu, 27 Jan 2011 00:32:36 +0000
(
01:32
+0100)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Thu, 27 Jan 2011 01:36:06 +0000
(20:36 -0500)
Fixes regression introduced in
f58d8ca1bd20180bfae3a3a047e8098e0b22b5aa
.
compositor/compositor.c
patch
|
blob
|
history
diff --git
a/compositor/compositor.c
b/compositor/compositor.c
index
324e73d
..
ed7656b
100644
(file)
--- a/
compositor/compositor.c
+++ b/
compositor/compositor.c
@@
-264,6
+264,8
@@
create_buffer_from_png(struct wlsc_compositor *ec,
struct wl_buffer *buffer;
pixels = wlsc_load_image(filename, width, height);
+ if(pixels == NULL)
+ return NULL;
buffer = ec->create_buffer(ec, width, height,
&ec->compositor.premultiplied_argb_visual,