--- a/ohbuild.sh
+++ b/ohbuild.sh
@@ -210,6 +210,22 @@
        detected_openhome_architecture = x86
 EOF
 
+    git checkout OpenHome/TestFramework/OptionParser.cpp
+    patch -p1 << "EOF"
+diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
+index fe90233..644fc0b 100644
+--- a/OpenHome/TestFramework/OptionParser.cpp
++++ b/OpenHome/TestFramework/OptionParser.cpp
+@@ -282,7 +282,7 @@ void OptionParser::SetUsage(const TChar* aUsage)
+ {
+     delete iUsage;
+     iUsage = NULL;
+-    iUsage = new TChar[strlen(iUsage)];
++    iUsage = new TChar[strlen(aUsage)];
+     (void)strcpy(iUsage, aUsage);
+ }
+EOF
+    
     cd  $topdir/ohTopology
     # Wed Mar 22 11:15:28 2017 +0000
     git checkout cc09c09da4be8d3d04adae5b8f0daaf8450906a3 || exit 1