From 9092f7aa4575abbf265a615256fb4ece7eb2ca5f Mon Sep 17 00:00:00 2001
From: Michael Sparmann <theseven@rockbox.org>
Date: Mon, 21 Jun 2010 12:34:28 +0000
Subject: Don't leak a file handle if nvram.bin is <8 bytes in size

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27011 a1c6a512-1295-4272-9138-f99709370657
---
 apps/settings.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/settings.c b/apps/settings.c
index ea59ff1707..12987c4746 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -119,12 +119,14 @@ static bool read_nvram_data(char* buf, int max_len)
     int var_count = 0, i = 0, buf_pos = 0;
 #ifndef HAVE_RTC_RAM
     int fd = open(NVRAM_FILE,O_RDONLY);
+    int bytes;
     if (fd < 0)
         return false;
     memset(buf,0,max_len);
-    if (read(fd,buf,max_len) < 8) /* min is 8 bytes,magic, ver, vars, crc32 */
-        return false;
+    bytes = read(fd,buf,max_len);
     close(fd);
+    if (bytes < 8) /* min is 8 bytes,magic, ver, vars, crc32 */
+        return false;
 #else
     memset(buf,0,max_len);
     /* read rtc block */
-- 
cgit v1.2.3