On 08/04/11 00:25, Robert Haas wrote:
> On Thu, Apr 7, 2011 at 5:06 PM, Jan Urbański <wulc...@wulczer.org> wrote:
>> On 07/04/11 23:01, Robert Haas wrote:
>>> On Wed, Apr 6, 2011 at 3:37 PM, Peter Eisentraut <pete...@gmx.net> wrote:
>>>> Add traceback information to PL/Python errors
>>>>
>>>> This mimics the traceback information the Python interpreter prints
>>>> with exceptions.
>>>>
>>>> Jan Urbański
>>>
>>> On my system this spits out a warning:
>>>
>>> plpython.c: In function ‘PLy_traceback’:
>>> plpython.c:4487: warning: ‘s’ may be used uninitialized in this function
>>> plpython.c:4487: note: ‘s’ was declared here
>>>
>>> That appears to be a live bug, unless it's guaranteed that lineno will
>>> always be > 0.
>>
>> lineno should be > 0, unless Python is trying to tell us that the code
>> frame originates from before the function.
>>
>>> Also, the loop test should really be written as current < lineno,
>>> rather than current != lineno, just in case we should manage to pass a
>>> lineno < 0, which with the current code would go into the tank and
>>> spin.
>>
>> Yeah, good point.
>>
>>> This part looks pretty sketchy, too:
>>>
>>> while (s && isspace((unsigned char) *s))
>>> s++;
>>>
>>> Perhaps we meant to test *s here. It's hard to believe that we're
>>> really intending to test whether the pointer has fallen off the end of
>>> the address space and wrapped around to NULL.
>>
>> Gah, so short a function and so many things that I managed to get wrong.
>
> Patch?
Attached.
>> There's also this:
>> http://archives.postgresql.org/pgsql-hackers/2011-04/msg00334.php
>
> Yep. I am assuming Peter will look at that one.
I guess so. This only fixes the things you noticed.
Jan
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 9352580..47d898a 100644
*** a/src/pl/plpython/plpython.c
--- b/src/pl/plpython/plpython.c
*************** cleanup:
*** 4484,4495 ****
static char *
get_source_line(const char *src, int lineno)
{
! const char *s;
! const char *next;
! int current = 0;
! next = src;
! while (current != lineno)
{
s = next;
next = strchr(s + 1, '\n');
--- 4484,4494 ----
static char *
get_source_line(const char *src, int lineno)
{
! const char *s = NULL;
! const char *next = src;
! int current = 0;
! while (current < lineno)
{
s = next;
next = strchr(s + 1, '\n');
*************** get_source_line(const char *src, int lin
*** 4501,4507 ****
if (current != lineno)
return NULL;
! while (s && isspace((unsigned char) *s))
s++;
if (next == NULL)
--- 4500,4506 ----
if (current != lineno)
return NULL;
! while (*s && isspace((unsigned char) *s))
s++;
if (next == NULL)
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
