From 5dbf537dfb39f7ad24b45e8bbaaad289cb5296f9 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Fri, 5 Apr 2019 22:02:36 +0100
Subject: [PATCH] [core] add listing exception for Apple SD card readers

* Also fix a Coverity warning
---
 src/dev.c        |  6 +++---
 src/hdd_vs_ufd.h |  9 +++++++++
 src/iso.c        |  3 ++-
 src/rufus.rc     | 10 +++++-----
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/dev.c b/src/dev.c
index c7b44dc9..c6ae6942 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -310,9 +310,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
 /* For debugging user reports of HDDs vs UFDs */
 //#define FORCED_DEVICE
 #ifdef FORCED_DEVICE
-#define FORCED_VID 0x067B
-#define FORCED_PID 0x2733
-#define FORCED_NAME "EAGET Mass Storage USB Device"
+#define FORCED_VID 0x05AC
+#define FORCED_PID 0x8406
+#define FORCED_NAME "APPLE SD Card Reader USB Device"
 #endif
 
 /*
diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h
index 08fcb32f..669372bd 100644
--- a/src/hdd_vs_ufd.h
+++ b/src/hdd_vs_ufd.h
@@ -252,6 +252,15 @@ static vidpid_score_t vidpid_score[] = {
 	{ 0x059f, 0x1027, -20 },	// 16 GB UFD
 	{ 0x059f, 0x103B, -20 },	// 16 GB UFD
 	{ 0x059f, 0x1064, -20 },	// 16 GB UFD
+	// Apple exceptions
+	{ 0x05ac, 0x8400, -20},
+	{ 0x05ac, 0x8401, -20},
+	{ 0x05ac, 0x8402, -20},
+	{ 0x05ac, 0x8403, -20},
+	{ 0x05ac, 0x8404, -20},
+	{ 0x05ac, 0x8405, -20},
+	{ 0x05ac, 0x8406, -20},
+	{ 0x05ac, 0x8407, -20},
 	// Prolific exceptions
 	{ 0x067b, 0x2506, -20 },	// 8 GB Micro Hard Drive
 	{ 0x067b, 0x2517, -20 },	// 1 GB UFD
diff --git a/src/iso.c b/src/iso.c
index 5a336787..0841d0c4 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -1332,7 +1332,6 @@ BOOL DumpFatDir(const char* path, int32_t cluster)
 			target = malloc(strlen(path) + safe_strlen(name) + 2);
 			if ((name == NULL) || (target == NULL)) {
 				uprintf("Could not allocate buffer");
-				safe_free(name);
 				goto out;
 			}
 			strcpy(target, path);
@@ -1400,6 +1399,8 @@ out:
 		if (p_iso != NULL)
 			iso9660_close(p_iso);
 	}
+	safe_free(name);
+	safe_free(target);
 	return ret;
 }
 
diff --git a/src/rufus.rc b/src/rufus.rc
index 88d250c7..5b4f24cb 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.6.1507"
+CAPTION "Rufus 3.6.1508"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1507,0
- PRODUCTVERSION 3,6,1507,0
+ FILEVERSION 3,6,1508,0
+ PRODUCTVERSION 3,6,1508,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.6.1507"
+            VALUE "FileVersion", "3.6.1508"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.6.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.6.1507"
+            VALUE "ProductVersion", "3.6.1508"
         END
     END
     BLOCK "VarFileInfo"