Fix unsafe loop test, and declare as_ident as bool rather than int.

robertmhaas · robertmhaas · commit b13da41eba0a · 2010-01-21T18:43:25.000Z
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.207 2010/01/21 14:58:53 rhaas Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.208 2010/01/21 18:43:25 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3066,7 +3066,7 @@ PQescapeString(char *to, const char *from, size_t length)
  * of memory condition, we return NULL, storing an error message into conn.
  */
 static char *
-PQescapeInternal(PGconn *conn, const char *str, size_t len, int as_ident)
+PQescapeInternal(PGconn *conn, const char *str, size_t len, bool as_ident)
 {
 	const char *s;
 	char   *result;
@@ -3082,7 +3082,7 @@ PQescapeInternal(PGconn *conn, const char *str, size_t len, int as_ident)
 		return NULL;
 
 	/* Scan the string for characters that must be escaped. */
-	for (s = str; *s != '\0' && (s - str) < len; ++s)
+	for (s = str; (s - str) < len && *s != '\0'; ++s)
 	{
 		if (*s == quote_char)
 			++num_quotes;
@@ -3188,13 +3188,13 @@ PQescapeInternal(PGconn *conn, const char *str, size_t len, int as_ident)
 char *
 PQescapeLiteral(PGconn *conn, const char *str, size_t len)
 {
-	return PQescapeInternal(conn, str, len, 0);
+	return PQescapeInternal(conn, str, len, false);
 }
 
 char *
 PQescapeIdentifier(PGconn *conn, const char *str, size_t len)
 {
-	return PQescapeInternal(conn, str, len, 1);
+	return PQescapeInternal(conn, str, len, true);
 }
 
 /* HEX encoding support for bytea */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.207 2010/01/21 14:58:53 rhaas Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.208 2010/01/21 18:43:25 rhaas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3066,7 +3066,7 @@ PQescapeString(char to, const char from, size_t length)`
`3066`	`3066`	`* of memory condition, we return NULL, storing an error message into conn.`
`3067`	`3067`	`*/`
`3068`	`3068`	`static char *`
`3069`		`-PQescapeInternal(PGconn conn, const char str, size_t len, int as_ident)`
	`3069`	`+PQescapeInternal(PGconn conn, const char str, size_t len, bool as_ident)`
`3070`	`3070`	`{`
`3071`	`3071`	`const char *s;`
`3072`	`3072`	`char *result;`
`@@ -3082,7 +3082,7 @@ PQescapeInternal(PGconn conn, const char str, size_t len, int as_ident)`
`3082`	`3082`	`return NULL;`
`3083`	`3083`
`3084`	`3084`	`/* Scan the string for characters that must be escaped. */`
`3085`		`- for (s = str; *s != '\0' && (s - str) < len; ++s)`
	`3085`	`+ for (s = str; (s - str) < len && *s != '\0'; ++s)`
`3086`	`3086`	`{`
`3087`	`3087`	`if (*s == quote_char)`
`3088`	`3088`	`++num_quotes;`
`@@ -3188,13 +3188,13 @@ PQescapeInternal(PGconn conn, const char str, size_t len, int as_ident)`
`3188`	`3188`	`char *`
`3189`	`3189`	`PQescapeLiteral(PGconn conn, const char str, size_t len)`
`3190`	`3190`	`{`
`3191`		`- return PQescapeInternal(conn, str, len, 0);`
	`3191`	`+ return PQescapeInternal(conn, str, len, false);`
`3192`	`3192`	`}`
`3193`	`3193`
`3194`	`3194`	`char *`
`3195`	`3195`	`PQescapeIdentifier(PGconn conn, const char str, size_t len)`
`3196`	`3196`	`{`
`3197`		`- return PQescapeInternal(conn, str, len, 1);`
	`3197`	`+ return PQescapeInternal(conn, str, len, true);`
`3198`	`3198`	`}`
`3199`	`3199`
`3200`	`3200`	`/* HEX encoding support for bytea */`