Merge pull request #2107 from mgreter/bugfix/issue_2106

Fix endless loop in `join_paths` (fixes #2106)
sass · Jun 18, 2016 · c6a8169 · c6a8169
2 parents 38fd793 + 32ceedc
commit c6a8169
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/file.cpp b/src/file.cpp
@@ -196,6 +196,7 @@ namespace Sass {
         bool is_slash = pos + 2 == L && (l[pos+1] == '/' || l[pos+1] == '\\');
         bool is_self = pos + 3 == L && (l[pos+1] == '.');
         if (!is_self && !is_slash) r = r.substr(3);
+        else if (pos == std::string::npos) break;
         l = l.substr(0, pos == std::string::npos ? pos : pos + 1);
       }