Fix a bug in multibyte_strchr().

Hiroshi Inoue · Hiroshi Inoue · commit af10378ab05f · 2002-04-04T01:36:17.000Z
diff --git a/src/interfaces/odbc/multibyte.c b/src/interfaces/odbc/multibyte.c
@@ -253,18 +253,18 @@ unsigned char *
 pg_mbschr(int csc, const unsigned char *string, unsigned int character)
 {
 	int			mb_st = 0;
-	unsigned char *s;
-	s = (unsigned char *) string;
+	const unsigned char *s, *rs = NULL;
 
-	for(;;) 
+	for(s = string; *s ; s++) 
 	{
 		mb_st = pg_CS_stat(mb_st, (unsigned char) *s, csc);
-		if (mb_st == 0 && (*s == character || *s == 0))
+		if (mb_st == 0 && (*s == character))
+		{
+			rs = s;
 			break;
-		else
-			s++;
+		}
 	}
-	return (s);
+	return (rs);
 }
 
 int

Original file line number	Diff line number	Diff line change
`@@ -253,18 +253,18 @@ unsigned char *`
`253`	`253`	`pg_mbschr(int csc, const unsigned char *string, unsigned int character)`
`254`	`254`	`{`
`255`	`255`	`int mb_st = 0;`
`256`		`- unsigned char *s;`
`257`		`- s = (unsigned char *) string;`
	`256`	`+ const unsigned char s, rs = NULL;`
`258`	`257`
`259`		`- for(;;)`
	`258`	`+ for(s = string; *s ; s++)`
`260`	`259`	`{`
`261`	`260`	`mb_st = pg_CS_stat(mb_st, (unsigned char) *s, csc);`
`262`		`- if (mb_st == 0 && (s == character \|\| s == 0))`
	`261`	`+ if (mb_st == 0 && (*s == character))`
	`262`	`+ {`
	`263`	`+ rs = s;`
`263`	`264`	`break;`
`264`		`- else`
`265`		`- s++;`
	`265`	`+ }`
`266`	`266`	`}`
`267`		`- return (s);`
	`267`	`+ return (rs);`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`int`