gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-07 22:34:18 +01:00
Code Issues Projects Releases Wiki Activity

Remove alloca(3)

Browse Source 
And use malloc() instead.

See "Dropped useless use of alloca(3)" from
http://git.altlinux.org/people/raorn/packages/WindowMaker.git
This commit is contained in:
Alexey I. Froloff
2009-03-24 17:06:00 +03:00
committed by Carlos R. Mafra
parent 8490e31fde
commit 2ccc8e4a79
6 changed files with 129 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
wrlib/png.c
View File

@@ -21,23 +21,6 @@
#include <config.h>
/* AIX requires this to be the first thing in the file. */
#ifdef __GNUC__
# define alloca __builtin_alloca
#else
# if HAVE_ALLOCA_H
# include <alloca.h>
# else
# ifdef _AIX
# pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
char *alloca();
# endif
# endif
# endif
#endif
#ifdef USE_PNG
#include <stdlib.h>
@@ -173,27 +156,25 @@ RImage *RLoadPNG(RContext * context, char *file, int index)
image->background.blue = bkcolor->blue >> 8;
}
png_rows = alloca(sizeof(char *) * height);
png_rows = calloc(height, sizeof(char *));
if (!png_rows) {
RErrorCode = RERR_NOMEMORY;
fclose(f);
RReleaseImage(image);
png_destroy_read_struct(&png, &pinfo, &einfo);
#ifdef C_ALLOCA
alloca(0);
#endif
return NULL;
}
for (y = 0; y < height; y++) {
png_rows[y] = alloca(png_get_rowbytes(png, pinfo));
png_rows[y] = malloc(png_get_rowbytes(png, pinfo));
if (!png_rows[y]) {
RErrorCode = RERR_NOMEMORY;
fclose(f);
RReleaseImage(image);
png_destroy_read_struct(&png, &pinfo, &einfo);
#ifdef C_ALLOCA
alloca(0);
#endif
while (y-- > 0)
if (png_rows[y])
free(png_rows[y]);
free(png_rows);
return NULL;
}
}
@@ -222,9 +203,10 @@ RImage *RLoadPNG(RContext * context, char *file, int index)
}
}
}
#ifdef C_ALLOCA
alloca(0);
#endif
for (y = 0; y < height; y++)
if (png_rows[y])
free(png_rows[y]);
free(png_rows);
return image;
}