From 3a414300b8444d06de7d801e393f379d6f935579 Mon Sep 17 00:00:00 2001 From: focus Date: Thu, 8 Dec 2011 14:27:25 +0000 Subject: [PATCH] Fix fd leak git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1956 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/driver/pictureviewer/bmp.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/driver/pictureviewer/bmp.cpp b/src/driver/pictureviewer/bmp.cpp index 7655ceadb..966517f07 100644 --- a/src/driver/pictureviewer/bmp.cpp +++ b/src/driver/pictureviewer/bmp.cpp @@ -89,7 +89,7 @@ int fh_bmp_load(const char *name,unsigned char **buffer,int* xp,int* yp) switch (bpp){ case 1: /* monochrome */ - skip = fill4B(x/8+(x%8?1:0)); + skip = fill4B(x/8 + ((x%8) ? 1 : 0)); lseek(fd, raster, SEEK_SET); { int bytes=x/8; @@ -210,6 +210,7 @@ int fh_bmp_load(const char *name,unsigned char **buffer,int* xp,int* yp) } break; case 16: /* 16bit RGB */ + close(fd); return(FH_ERROR_FORMAT); break; case 24: /* 24bit RGB */ @@ -232,6 +233,7 @@ int fh_bmp_load(const char *name,unsigned char **buffer,int* xp,int* yp) } break; default: + close(fd); return(FH_ERROR_FORMAT); }