glcpp: Don't look for backslashes before the beginning of the string.

Fixes a valgrind error.
This commit is contained in:
Kenneth Graunke
2010-07-30 13:24:50 -07:00
parent 0cf545ec69
commit 805cbf3922

View File

@@ -93,12 +93,16 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader)
const char *newline;
while ((newline = strchr(search_start, '\n')) != NULL) {
const char *backslash = NULL;
/* # of characters preceding the newline. */
int n = newline - shader;
/* Find the preceding '\', if it exists */
if (newline[-1] == '\\') {
if (n >= 1 && newline[-1] == '\\')
backslash = newline - 1;
} else if (newline[-1] == '\r' && newline[-2] == '\\') {
else if (n >= 2 && newline[-1] == '\r' && newline[-2] == '\\')
backslash = newline - 2;
}
/* Double backslashes don't count (the backslash is escaped) */
if (backslash != NULL && backslash[-1] == '\\') {
backslash = NULL;