aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2024-02-27 16:37:17 -0500
committerBob Arnson <github@bobs.org>2024-02-27 17:33:39 -0500
commitd1b711af0d33713f29f583f9c9a17b54d9a90df3 (patch)
tree194a7cd40a8fec0b0c0f43e09a29655e6939be59
parent58d81bb1b6f7d7c6104914b3070dac95f16877c4 (diff)
downloadwix-d1b711af0d33713f29f583f9c9a17b54d9a90df3.tar.gz
wix-d1b711af0d33713f29f583f9c9a17b54d9a90df3.tar.bz2
wix-d1b711af0d33713f29f583f9c9a17b54d9a90df3.zip
Cleaning up a typo and a missed commit.
-rw-r--r--src/burn/engine/section.cpp2
-rw-r--r--src/ext/Firewall/wixext/FirewallDecompiler.cs5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/burn/engine/section.cpp b/src/burn/engine/section.cpp
index 989bfb17..fd3ce92c 100644
--- a/src/burn/engine/section.cpp
+++ b/src/burn/engine/section.cpp
@@ -369,7 +369,7 @@ HRESULT VerifySectionMatchesMemoryPEHeader(
369 if (sizeof(BURN_SECTION_HEADER) > pSectionHeader->SizeOfRawData) 369 if (sizeof(BURN_SECTION_HEADER) > pSectionHeader->SizeOfRawData)
370 { 370 {
371 hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); 371 hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
372 ExitOnRootFailure(hr, "Failed to read section info, data to short: %u", pSectionHeader->SizeOfRawData); 372 ExitOnRootFailure(hr, "Failed to read section info, data too short: %u", pSectionHeader->SizeOfRawData);
373 } 373 }
374 374
375 // Get Burn section info. 375 // Get Burn section info.
diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs
index 46ab2bd1..4fafc0a0 100644
--- a/src/ext/Firewall/wixext/FirewallDecompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs
@@ -506,6 +506,11 @@ namespace WixToolset.Firewall
506 { 506 {
507 public static string ToCamelCase(this string str) 507 public static string ToCamelCase(this string str)
508 { 508 {
509 if (String.IsNullOrEmpty(str))
510 {
511 return str;
512 }
513
509 var camelCase = str[0].ToString().ToLowerInvariant() + str.Substring(1); 514 var camelCase = str[0].ToString().ToLowerInvariant() + str.Substring(1);
510 515
511 return camelCase; 516 return camelCase;