liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed memleak when raw loading fails

Browse Source
This commit is contained in:
Oliver Duis
2012-06-26 22:45:37 +02:00
parent 17d60e12b0
commit 3819da3726
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/rawimage.cc
View File

@@ -182,6 +182,7 @@ int RawImage::loadRaw (bool loadData, bool closeFile)
if (setjmp (failure)) {
if (image) { free (image); image=NULL; }
if (raw_image) { free(raw_image); raw_image=NULL; }
fclose(ifp); ifp=NULL;
return 100;
}
@@ -193,6 +194,7 @@ int RawImage::loadRaw (bool loadData, bool closeFile)
if (raw_image) {
crop_masked_pixels();
free (raw_image);
raw_image=NULL;
}
// Load embedded profile
@@ -205,9 +207,9 @@ int RawImage::loadRaw (bool loadData, bool closeFile)
// Setting the black and cblack
unsigned int minBlack = cblack[3];
for (int c=0; c < 3; c++)
if (minBlack > cblack[c])
minBlack = cblack[c];
if (minBlack > cblack[c]) minBlack = cblack[c];
for (int c=0; c < 4; c++) cblack[c] -= minBlack;
black += minBlack;
for (int c=0; c < 4; c++) cblack[c] += black;
calcBlack=black; // safe for compatibility with darkframe substraction