mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-29 14:05:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

[iso] fix a possible crash when scanning the install.wim version

Browse source 
* Closes #659
* Issue and fix reported by DaPa
This commit is contained in:
Pete Batard 2015-12-28 20:56:10 +01:00
parent b7d1b77e4f
commit 961ca93a51
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/iso.c
View file

@ -690,7 +690,7 @@ BOOL ExtractISO(const char* src_iso, const char* dest_dir, BOOL scan)
iso_blocking_status = 0;
}
/* First try to open as UDF - fallback to ISO if it failed */
// First try to open as UDF - fallback to ISO if it failed
p_udf = udf_open(src_iso);
if (p_udf == NULL)
goto try_iso;
@ -933,7 +933,7 @@ int64_t ExtractISOFile(const char* iso, const char* iso_file, const char* dest_f
goto out;
}
/* First try to open as UDF - fallback to ISO if it failed */
// First try to open as UDF - fallback to ISO if it failed
p_udf = udf_open(iso);
if (p_udf == NULL)
goto try_iso;
@ -1024,10 +1024,14 @@ uint32_t GetInstallWimVersion(const char* iso)
iso9660_stat_t *p_statbuf = NULL;
wim_path = safe_strdup(&img_report.install_wim_path[2]);
for (p = wim_path; p != 0; p++)
if (wim_path == NULL)
goto out;
// UDF indiscriminately accepts slash or backslash delimiters,
// but ISO-9660 requires slash
for (p = wim_path; *p != 0; p++)
if (*p == '\\') *p = '/';
/* First try to open as UDF - fallback to ISO if it failed */
// First try to open as UDF - fallback to ISO if it failed
p_udf = udf_open(iso);
if (p_udf == NULL)
goto try_iso;