1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp
index 0aeb63fbbf6..0d73f1df4c4 100644
--- a/cpp/src/IcePatch2Lib/Util.cpp
+++ b/cpp/src/IcePatch2Lib/Util.cpp
@@ -150,7 +150,14 @@ IcePatch2::readFileInfo(FILE* fp, FileInfo& info)
 
     string s;
     getline(is, s, '\t');
-    IceUtilInternal::unescapeString(s, 0, s.size(), info.path);
+    try
+    {
+        info.path = IceUtilInternal::unescapeString(s, 0, s.size());
+    }
+    catch(const IceUtil::IllegalArgumentException& ex)
+    {
+        throw ex.reason();
+    }
 
     getline(is, s, '\t');
     info.checksum = stringToBytes(s);