Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3779ac6

Browse files
committed
Make printf("%s", NULL) print "(null)" instead of crashing.
We previously took a hard-line attitude that callers should never print a null string pointer, and doing so is worthy of an assertion failure or crash. However, we've long since flushed out any easy-to-find bugs of that nature. What remains is a lot of code that perhaps could fail that way in hard-to-reach corner cases. For example, in something as simple as ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("constraint \"%s\" for table \"%s\" does not exist", conname, get_rel_name(relid)))); one must wonder whether it's completely guaranteed that get_rel_name cannot return NULL in this context. If such a situation did occur, the existing policy converts what might be a pretty minor bug into a server crash condition. This is not good for robustness. Hence, let's follow the lead of glibc and print "(null)" instead of failing. We should, of course, still consider it a bug if that behavior is reachable in ordinary use; but crashing seems less desirable than not crashing. This fix works across-the-board in v12 and up, where we always use src/port/snprintf.c. Before that, on most platforms we're at the mercy of the local libc, but it appears that Solaris 10 is the only supported platform where we'd still get a crash. Most other platforms such as *BSD, macOS, and Solaris 11 have adopted glibc's behavior at some point. (AIX and HPUX just print "" not "(null)", but that's close enough.) I've not checked what Windows' native printf would do, but it doesn't matter because we've long used snprintf.c on that platform. In v12 and up, also const-ify related code so that we're not casting away const on the constant string. This is just neatnik-ism, since next to no compilers will warn about that. Discussion: https://postgr.es/m/17098-b960f3616c861f83@postgresql.org
1 parent 76fa3db commit 3779ac6

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/port/snprintf.c

+9-7
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static bool find_arguments(const char *format, va_list args,
320320
PrintfArgValue *argvalues);
321321
static void fmtstr(const char *value, int leftjust, int minlen, int maxwidth,
322322
int pointflag, PrintfTarget *target);
323-
static void fmtptr(void *value, PrintfTarget *target);
323+
static void fmtptr(const void *value, PrintfTarget *target);
324324
static void fmtint(long long value, char type, int forcesign,
325325
int leftjust, int minlen, int zpad, int precision, int pointflag,
326326
PrintfTarget *target);
@@ -394,7 +394,7 @@ dopr(PrintfTarget *target, const char *format, va_list args)
394394
int cvalue;
395395
long long numvalue;
396396
double fvalue;
397-
char *strvalue;
397+
const char *strvalue;
398398
PrintfArgValue argvalues[PG_NL_ARGMAX + 1];
399399

400400
/*
@@ -439,7 +439,8 @@ dopr(PrintfTarget *target, const char *format, va_list args)
439439
{
440440
format++;
441441
strvalue = va_arg(args, char *);
442-
Assert(strvalue != NULL);
442+
if (strvalue == NULL)
443+
strvalue = "(null)";
443444
dostr(strvalue, strlen(strvalue), target);
444445
if (target->failed)
445446
break;
@@ -670,8 +671,9 @@ dopr(PrintfTarget *target, const char *format, va_list args)
670671
strvalue = argvalues[fmtpos].cptr;
671672
else
672673
strvalue = va_arg(args, char *);
673-
/* Whine if someone tries to print a NULL string */
674-
Assert(strvalue != NULL);
674+
/* If string is NULL, silently substitute "(null)" */
675+
if (strvalue == NULL)
676+
strvalue = "(null)";
675677
fmtstr(strvalue, leftjust, fieldwidth, precision, pointflag,
676678
target);
677679
break;
@@ -681,7 +683,7 @@ dopr(PrintfTarget *target, const char *format, va_list args)
681683
strvalue = argvalues[fmtpos].cptr;
682684
else
683685
strvalue = va_arg(args, char *);
684-
fmtptr((void *) strvalue, target);
686+
fmtptr((const void *) strvalue, target);
685687
break;
686688
case 'e':
687689
case 'E':
@@ -995,7 +997,7 @@ fmtstr(const char *value, int leftjust, int minlen, int maxwidth,
995997
}
996998

997999
static void
998-
fmtptr(void *value, PrintfTarget *target)
1000+
fmtptr(const void *value, PrintfTarget *target)
9991001
{
10001002
int vallen;
10011003
char convert[64];

0 commit comments

Comments
 (0)