Fix issues detected by static analysis tool

Change-Id: I1dc356839dd3af7141df7dc727d58aa782b69da0
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/scanner-utils.h b/src/scanner-utils.h
index e6cd192..3be8392 100644 (file)
--- a/src/scanner-utils.h
+++ b/src/scanner-utils.h
@@ -203,14 +203,13 @@ static inline bool
 scanner_hex(struct scanner *s, uint8_t *out)
 {
     int i;
-    unsigned int result = 0;
     for (i = 0, *out = 0; is_xdigit(scanner_peek(s)) && i < 2; i++) {
         const char c = scanner_next(s);
         const char offset = (c >= '0' && c <= '9' ? '0' :
                              c >= 'a' && c <= 'f' ? 'a' - 10 : 'A' - 10);
 
-        result = *out * 16 + c - offset;
-        *out = (uint8_t)result;
+        if (*out * 16 + c >= offset)
+            *out = *out * 16 + c - offset;
     }
     return i > 0;
 }

diff --git a/test/common.c b/test/common.c
index cb911e8..0bed3de 100644 (file)
--- a/test/common.c
+++ b/test/common.c
@@ -260,7 +260,7 @@ test_read_file(const char *path_rel)
 
     remaining = info.st_size;
     tmp = ret;
-    while ((count = read(fd, tmp, remaining))) {
+    while ((count = read(fd, tmp, remaining)) > 0) {
         remaining -= count;
         tmp += count;
     }