Safe guard in case of imporper data is provided to elog()

tatsuo-ishii · tatsuo-ishii · commit fa877ed8eea1 · 2001-02-21T06:05:23.000Z
in multi-byte build.
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.80 2001/01/24 19:43:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.81 2001/02/21 06:05:23 ishii Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -683,6 +683,8 @@ write_syslog(int level, const char *line)
 #ifdef MULTIBYTE
 			/* trim to multibyte letter boundary */ 
 			buflen = pg_mbcliplen(buf, l, l);
+			if (buflen <= 0)
+			    return;
 			buf[buflen] = '\0';
 			l = strlen(buf);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.80 2001/01/24 19:43:15 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.81 2001/02/21 06:05:23 ishii Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -683,6 +683,8 @@ write_syslog(int level, const char *line)`
`683`	`683`	`#ifdef MULTIBYTE`
`684`	`684`	`/* trim to multibyte letter boundary */`
`685`	`685`	`buflen = pg_mbcliplen(buf, l, l);`
	`686`	`+ if (buflen <= 0)`
	`687`	`+ return;`
`686`	`688`	`buf[buflen] = '\0';`
`687`	`689`	`l = strlen(buf);`
`688`	`690`	`#endif`