Merge pull request #24 from imageworks/issue_20_deadlock_in_split_path

accepting fix proposed in issue #20 - for deadlock in path split when…

Author: grdanny

pystring.cpp

@@ -1347,7 +1347,8 @@ namespace path
 
         // set i to index beyond p's last slash
         int i = (int)p.size();
-        
+
+        // walk back to find the index of the first slash from the end       
         while(i>0 && (p[i-1] != '\\') && (p[i-1] != '/'))
         {
             i = i - 1;
@@ -1361,7 +1362,7 @@ namespace path
         while(!head2.empty() && ((pystring::slice(head2,-1) == "/") ||
                                  (pystring::slice(head2,-1) == "\\")))
         {
-            head2 = pystring::slice(head,0,-1);
+            head2 = pystring::slice(head2,0,-1);
         }
 
         if(!head2.empty()) head = head2;

test.cpp

@@ -624,6 +624,9 @@ PYSTRING_ADD_TEST(pystring_os_path, split)
     split_posix(head, tail, "/a");  PYSTRING_CHECK_EQUAL(head, "/" );  PYSTRING_CHECK_EQUAL(tail, "a" );
     split_posix(head, tail, "/a/b/");  PYSTRING_CHECK_EQUAL(head, "/a/b" );  PYSTRING_CHECK_EQUAL(tail, "" );
     split_posix(head, tail, "/a/b");  PYSTRING_CHECK_EQUAL(head, "/a" );  PYSTRING_CHECK_EQUAL(tail, "b" );
+    split_posix(head, tail, "/a/b//");  PYSTRING_CHECK_EQUAL(head, "/a/b" );  PYSTRING_CHECK_EQUAL(tail, "" );
+    split_posix(head, tail, "/a/b/////////////");  PYSTRING_CHECK_EQUAL(head, "/a/b" );  PYSTRING_CHECK_EQUAL(tail, "" );
+
 
     split_nt(head, tail, "");  PYSTRING_CHECK_EQUAL(head, "" );  PYSTRING_CHECK_EQUAL(tail, "" );
     split_nt(head, tail, "\\");  PYSTRING_CHECK_EQUAL(head, "\\" );  PYSTRING_CHECK_EQUAL(tail, "" );
@@ -632,6 +635,8 @@ PYSTRING_ADD_TEST(pystring_os_path, split)
     split_nt(head, tail, "c:\\a");  PYSTRING_CHECK_EQUAL(head, "c:\\" );  PYSTRING_CHECK_EQUAL(tail, "a" );
     split_nt(head, tail, "c:\\a\\b");  PYSTRING_CHECK_EQUAL(head, "c:\\a" );  PYSTRING_CHECK_EQUAL(tail, "b" );
     split_nt(head, tail, "c:\\a\\b\\");  PYSTRING_CHECK_EQUAL(head, "c:\\a\\b" );  PYSTRING_CHECK_EQUAL(tail, "" );
+    split_nt(head, tail, "D:\\dir\\\\");  PYSTRING_CHECK_EQUAL(head, "D:\\dir" );  PYSTRING_CHECK_EQUAL(tail, "" );
+
 }
 
 PYSTRING_ADD_TEST(pystring_os_path, splitext)