fix possible Resource leak

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@249 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-02-01 22:21:32 +00:00
parent c2af485d6d
commit f06a3982ef
3 changed files with 5 additions and 0 deletions

View File

@@ -1187,6 +1187,7 @@ bool CFrameBuffer::loadPictureToMem(const std::string & filename, const uint16_t
(height != ((header.height_hi << 8) | header.height_lo))) (height != ((header.height_hi << 8) | header.height_lo)))
{ {
printf("error while loading icon: %s - invalid resolution = %hux%hu\n", filename.c_str(), width, height); printf("error while loading icon: %s - invalid resolution = %hux%hu\n", filename.c_str(), width, height);
close(lfd);
return false; return false;
} }

View File

@@ -99,6 +99,7 @@ int fh_bmp_load(const char *name,unsigned char **buffer,int* xp,int* yp)
if(tbuffer==NULL) if(tbuffer==NULL)
{ {
printf("Error: malloc\n"); printf("Error: malloc\n");
close(fd);
return (FH_ERROR_MALLOC); return (FH_ERROR_MALLOC);
} }
for (i=0; i<y; i++) { for (i=0; i<y; i++) {

View File

@@ -176,6 +176,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
if(filesize==0) if(filesize==0)
{ {
ErrorMessage = g_Locale->getText(LOCALE_FLASHUPDATE_FILEIS0BYTES); ErrorMessage = g_Locale->getText(LOCALE_FLASHUPDATE_FILEIS0BYTES);
close(fd1);
return false; return false;
} }
@@ -187,6 +188,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
//g_Zapit->shutdown(); sleep(2); //g_Zapit->shutdown(); sleep(2);
if(!erase(globalProgressEndErase)) if(!erase(globalProgressEndErase))
{ {
close(fd1);
return false; return false;
} }
@@ -263,6 +265,7 @@ bool CFlashTool::erase(int globalProgressEnd)
{ {
// TODO: localize error message // TODO: localize error message
ErrorMessage = "can't get mtd-info"; ErrorMessage = "can't get mtd-info";
close(fd);
return false; return false;
} }