From 2b0cc9349f4eb759ded64dc930cca747aa5856b0 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Sat, 20 Aug 2016 10:12:53 +0200
Subject: [PATCH] [misc] fix a couple code analysis warnings

---
 README.md    |  2 +-
 src/iso.c    |  4 ++--
 src/rufus.rc | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7d2335df..cbcb6c60 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Rufus: The Reliable USB Formatting Utility
 
 [![Build status](https://ci.appveyor.com/api/projects/status/0nciqepn6hko4to9?svg=true)](https://ci.appveyor.com/project/pbatard/rufus)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2172/badge.svg)](https://scan.coverity.com/projects/pbatard-rufus)
-[![Licence](https://img.shields.io/badge/license-GPLv3-brightgreen.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
+[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)
 
 ![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icon-set/rufus-128.png)
 
diff --git a/src/iso.c b/src/iso.c
index b1ec5c52..5833dd21 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -184,7 +184,7 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t i_file_length, cons
 		}
 
 		// Check for various files in root (psz_dirname = "")
-		if (*psz_dirname == 0) {
+		if ((psz_dirname != NULL) && (psz_dirname[0] == 0)) {
 			if (safe_strnicmp(psz_basename, bootmgr_efi_name, safe_strlen(bootmgr_efi_name)-5) == 0) {
 				img_report.has_bootmgr = TRUE;
 			}
@@ -249,7 +249,7 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t i_file_length, cons
 		return TRUE;
 	}
 	// In case there's an ldlinux.sys on the ISO, prevent it from overwriting ours
-	if ((*psz_dirname == 0) && (safe_strcmp(psz_basename, ldlinux_name) == 0)) {
+	if ((psz_dirname != NULL) && (psz_dirname[0] == 0) && (safe_strcmp(psz_basename, ldlinux_name) == 0)) {
 		uprintf("skipping % file from ISO image\n", ldlinux_name);
 		return TRUE;
 	}
diff --git a/src/rufus.rc b/src/rufus.rc
index 11c70096..0b8ccd94 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.11.986"
+CAPTION "Rufus 2.11.987"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -320,8 +320,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,11,986,0
- PRODUCTVERSION 2,11,986,0
+ FILEVERSION 2,11,987,0
+ PRODUCTVERSION 2,11,987,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -338,13 +338,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.11.986"
+            VALUE "FileVersion", "2.11.987"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.11.986"
+            VALUE "ProductVersion", "2.11.987"
         END
     END
     BLOCK "VarFileInfo"