postgres.git / summary / log / commit / refs

commit    babbd1219e0e29f67343be2746941e9aa1767f54
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sat Feb 23 19:23:37 2008 +0000
First released in: 8.4.0, 7.4.20, 8.0.16, 8.1.12, 8.2.7, 8.3.1

    Avoid trying to print a NULL char pointer in --describe-config.  On some
    platforms this works, but on some it crashes.  Zdenek Kotala


 src/backend/utils/misc/help_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c
index 0c27f96dee1..a6732c7c1ea 100644
--- a/src/backend/utils/misc/help_config.c
+++ b/src/backend/utils/misc/help_config.c
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.19 2008/01/01 19:45:54 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.19.2.1 2008/02/23 19:23:37 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -117,7 +117,7 @@ printMixedStruct(mixedStruct *structToPrint)
 
 		case PGC_STRING:
 			printf("STRING\t%s\t\t\t",
-				   structToPrint->string.boot_val);
+				   structToPrint->string.boot_val ? structToPrint->string.boot_val : "");
 			break;
 
 		default:


[parent: 7b416c8c1a68]