projects
/
openjpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cppcheck fix for openjp2 (#740)
[openjpeg.git]
/
src
/
bin
/
jp2
/
convertpng.c
diff --git
a/src/bin/jp2/convertpng.c
b/src/bin/jp2/convertpng.c
index 8d117412f3142be4fbece301d078c69153255f7f..5635c7d0d8897c6446addc4674e7ec5cbc6caba9 100644
(file)
--- a/
src/bin/jp2/convertpng.c
+++ b/
src/bin/jp2/convertpng.c
@@
-185,9
+185,17
@@
opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
rows = (OPJ_BYTE**)calloc(height+1, sizeof(OPJ_BYTE*));
rows = (OPJ_BYTE**)calloc(height+1, sizeof(OPJ_BYTE*));
- for(i = 0; i < height; ++i)
+ if(rows == NULL){
+ fprintf(stderr, "pngtoimage: memory out\n");
+ goto fin;
+ }
+ for(i = 0; i < height; ++i){
rows[i] = (OPJ_BYTE*)malloc(png_get_rowbytes(png,info));
rows[i] = (OPJ_BYTE*)malloc(png_get_rowbytes(png,info));
-
+ if(rows[i] == NULL){
+ fprintf(stderr,"pngtoimage: memory out\n");
+ goto fin;
+ }
+ }
png_read_image(png, rows);
/* Create image */
png_read_image(png, rows);
/* Create image */
@@
-235,7
+243,7
@@
fin:
if(rows)
{
for(i = 0; i < height; ++i)
if(rows)
{
for(i = 0; i < height; ++i)
- free(rows[i]);
+
if(rows[i])
free(rows[i]);
free(rows);
}
if (row32s) {
free(rows);
}
if (row32s) {