From 0ba7b26fac0ba140ea28c13826b590f90b83f7ad Mon Sep 17 00:00:00 2001 From: deuce <> Date: Fri, 8 Feb 2013 03:11:48 +0000 Subject: [PATCH] fix last commit - do not reset ret to NULL. --- src/sbbs3/sbbs.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h index 0b895abdb6..6948387e95 100644 --- a/src/sbbs3/sbbs.h +++ b/src/sbbs3/sbbs.h @@ -121,10 +121,9 @@ extern int thread_suid_broken; /* NPTL is no longer broken */ \ if(JSSTSlenptr==NULL) \ JSSTSlenptr=&JSSTSlen; \ - (ret)=NULL; \ if((str) != NULL) { \ if((JSSTSstrval=JS_GetStringCharsAndLength((cx), (str), JSSTSlenptr))) { \ - if(*sizeptr < (*JSSTSlenptr+1)) { \ + if((*sizeptr < (*JSSTSlenptr+1 )) || (ret)==NULL) { \ *sizeptr = *JSSTSlenptr+1; \ if((JSSTStmpptr=(char *)realloc((ret), *sizeptr))==NULL) { \ JS_ReportError(cx, "Error reallocating %lu bytes at %s:%d", (*JSSTSlenptr)+1, getfname(__FILE__), __LINE__); \ -- GitLab