From b6bc481d5540a3ad0d39db1e9881e6bd52e54213 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Fri, 8 Apr 2011 00:30:54 -0400 Subject: [PATCH] Fix some sloppiness in new PL/python get_source_line() function. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Jan Urbański --- src/pl/plpython/plpython.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 935258044d..47d898a976 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -4484,12 +4484,11 @@ cleanup: static char * get_source_line(const char *src, int lineno) { - const char *s; - const char *next; - int current = 0; + const char *s = NULL; + const char *next = src; + int current = 0; - next = src; - while (current != lineno) + while (current < lineno) { s = next; next = strchr(s + 1, '\n'); @@ -4501,7 +4500,7 @@ get_source_line(const char *src, int lineno) if (current != lineno) return NULL; - while (s && isspace((unsigned char) *s)) + while (*s && isspace((unsigned char) *s)) s++; if (next == NULL) -- 2.40.0