Merge pull request #2405 from mgreter/hotfix/invalid-error-indicator

mgreter · web-flow · commit cb9f28cbca0c · 2017-05-30T16:53:45.000+02:00
Hotfix issue with invalid error indicator (#2404)
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -2957,6 +2957,8 @@ namespace Sass {
     size_t right_subpos = right.size() > 15 ? right.size() - 15 : 0;
     if (left_subpos && ellipsis_left) left = ellipsis + left.substr(left_subpos);
     if (right_subpos && ellipsis_right) right = right.substr(right_subpos) + ellipsis;
+    // Hotfix when source is null, probably due to interpolation parsing!?
+    if (source == NULL || *source == 0) source = pstate.src;
     // now pass new message to the more generic error function
     error(msg + prefix + quote(left) + middle + quote(right), pstate);
   }

Original file line number	Diff line number	Diff line change
`@@ -2957,6 +2957,8 @@ namespace Sass {`
`2957`	`2957`	`size_t right_subpos = right.size() > 15 ? right.size() - 15 : 0;`
`2958`	`2958`	`if (left_subpos && ellipsis_left) left = ellipsis + left.substr(left_subpos);`
`2959`	`2959`	`if (right_subpos && ellipsis_right) right = right.substr(right_subpos) + ellipsis;`
	`2960`	`+ // Hotfix when source is null, probably due to interpolation parsing!?`
	`2961`	`+ if (source == NULL \|\| *source == 0) source = pstate.src;`
`2960`	`2962`	`// now pass new message to the more generic error function`
`2961`	`2963`	`error(msg + prefix + quote(left) + middle + quote(right), pstate);`
`2962`	`2964`	`}`