old
/
legacy-imlib2
3
0
Fork 4
Code Issues 3 Pull Requests Projects Releases Wiki Activity

check for some alloc failures

This commit is contained in:
NRK 2022-05-08 00:10:59 +06:00 committed by Kim Woelders
parent 693d6c63ca
commit 675b69414a
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/api.c
View File

@ -227,7 +227,8 @@ imlib_context_new(void)
{
ImlibContext *context = malloc(sizeof(ImlibContext));
*context = ctx_default;
if (context)
*context = ctx_default;
return context;
}
@ -1328,8 +1329,11 @@ imlib_create_image_from_drawable(Pixmap mask, int x, int y, int width,
mask = None;
}
im = __imlib_CreateImage(width, height, NULL);
if (!im)
return NULL;
im->data = malloc(width * height * sizeof(uint32_t));
if (__imlib_GrabDrawableToRGBA(im->data, 0, 0, width, height, ctx->display,
if (im->data &&
__imlib_GrabDrawableToRGBA(im->data, 0, 0, width, height, ctx->display,
ctx->drawable, mask, ctx->visual,
ctx->colormap, ctx->depth, x, y, width,
height, &domask, need_to_grab_x))
@ -1354,7 +1358,14 @@ imlib_create_image_from_ximage(XImage * image, XImage * mask, int x, int y,
if (!IMAGE_DIMENSIONS_OK(width, height))
return NULL;
im = __imlib_CreateImage(width, height, NULL);
if (!im)
return NULL;
im->data = malloc(width * height * sizeof(uint32_t));
if (!im->data)
{
__imlib_FreeImage(im);
return NULL;
}
__imlib_GrabXImageToRGBA(im->data, 0, 0, width, height,
ctx->display, image, mask, ctx->visual,
ctx->depth, x, y, width, height, need_to_grab_x);
@ -1381,7 +1392,14 @@ imlib_create_scaled_image_from_drawable(Pixmap mask, int source_x,
domask = mask != 0 || get_mask_from_shape;
im = __imlib_CreateImage(destination_width, destination_height, NULL);
if (!im)
return NULL;
im->data = malloc(destination_width * destination_height * sizeof(uint32_t));
if (!im->data)
{
__imlib_FreeImage(im);
return NULL;
}
__imlib_GrabDrawableScaledToRGBA(im->data, 0, 0,
destination_width, destination_height,

2
src/lib/colormod.c
View File

@ -16,6 +16,8 @@ __imlib_CreateCmod(void)
int i;
cm = malloc(sizeof(ImlibColorModifier));
if (!cm)
return NULL;
cm->modification_count = mod_count;
for (i = 0; i < 256; i++)
{