Commitb65ab31

committed

Eliminate token length assumption in scanstr().

1 parenta7fd74e commitb65ab31Copy full SHA for b65ab31

File tree

+20

-13

lines changed

+20

-13

lines changed

Lines changed: 8 additions & 3 deletions

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/bootstrap/bootscanner.l,v 1.14 1999/07/17 20:16:47 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.15 1999/09/11 22:26:41 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -98,12 +98,17 @@ insert{ return(INSERT_TUPLE); }`
`98`	`98`	`return(ID);`
`99`	`99`	`}`
`100`	`100`	`{id}{`
`101`		`-yylval.ival =EnterString(scanstr((char*)yytext));`
	`101`	`+char newid =scanstr((char)yytext);`
	`102`	`+yylval.ival =EnterString(newid);`
	`103`	`+pfree(newid);`
`102`	`104`	`return(ID);`
`103`	`105`	`}`
`104`	`106`	`{sid}{`
	`107`	`+char *newid;`
`105`	`108`	`yytext[strlen(yytext)-1] ='\0';/* strip off quotes */`
`106`		`-yylval.ival =EnterString(scanstr((char*)yytext+1));`
	`109`	`+newid =scanstr((char*)yytext+1);`
	`110`	`+yylval.ival =EnterString(newid);`
	`111`	`+pfree(newid);`
`107`	`112`	`yytext[strlen(yytext)] ='"';/* restore quotes */`
`108`	`113`	`return(ID);`
`109`	`114`	`}`

Lines changed: 2 additions & 2 deletions

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/parser/scan.l,v 1.53 1999/09/07 00:13:27 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.54 1999/09/11 22:26:35 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -246,7 +246,7 @@ other.`
`246`	`246`	`}`
`247`	`247`	`<xq>{xqstop}{`
`248`	`248`	`BEGIN(INITIAL);`
`249`		`-yylval.str =pstrdup(scanstr(literal));`
	`249`	`+yylval.str =scanstr(literal);`
`250`	`250`	`return SCONST;`
`251`	`251`	`}`
`252`	`252`	`<xq>{xqdouble}\|`

Lines changed: 7 additions & 5 deletions

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/parser/scansup.c,v 1.16 1999/07/17 20:17:27 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.17 1999/09/11 22:26:35 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -25,24 +25,26 @@`
`25`	`25`	`* if the string passed in has escaped codes, map the escape codes to actual`
`26`	`26`	`* chars`
`27`	`27`	`*`
`28`		`- * the string returned isa pointer to static storage and should NOT`
`29`		`- *be freed by thecaller.`
	`28`	`+ * the string returned ispalloc'd and should eventually be pfree'd by the`
	`29`	`+ * caller!`
`30`	`30`	`* ----------------`
`31`	`31`	`*/`
`32`	`32`
`33`	`33`	`char*`
`34`	`34`	`scanstr(char*s)`
`35`	`35`	`{`
`36`		`-staticcharnewStr[MAX_PARSE_BUFFER];`
	`36`	`+char*newStr;`
`37`	`37`	`intlen,`
`38`	`38`	`i,`
`39`	`39`	`j;`
`40`	`40`
`41`	`41`	`if (s==NULL\|\|s[0]=='\0')`
`42`		`-returns;`
	`42`	`+returnpstrdup("");`
`43`	`43`
`44`	`44`	`len=strlen(s);`
`45`	`45`
	`46`	`+newStr=palloc(len+1);/* string cannot get longer */`
	`47`	`+`
`46`	`48`	`for (i=0,j=0;i<len;i++)`
`47`	`49`	`{`
`48`	`50`	`if (s[i]=='\'')`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ cppline{space}#.(\\{space}\n)\n*`
`239`	`239`	`}`
`240`	`240`	`<xq>{xqstop}{`
`241`	`241`	`BEGIN(SQL);`
`242`		`-/* yylval.str =mm_strdup(scanstr(literal));*/`
	`242`	`+/* yylval.str = scanstr(literal);*/`
`243`	`243`	`yylval.str =mm_strdup(literal);`
`244`	`244`	`return SCONST;`
`245`	`245`	`}`
`@@ -601,7 +601,7 @@ cppline{space}#.(\\{space}\n)\n*`
`601`	`601`	`if (strcmp(old, ptr->old) ==0)`
`602`	`602`	`{`
`603`	`603`	`free(ptr->new);`
`604`		`-/* ptr->new =mm_strdup(scanstr(literal));*/`
	`604`	`+/* ptr->new = scanstr(literal);*/`
`605`	`605`	`ptr->new =mm_strdup(literal);`
`606`	`606`	`}`
`607`	`607`	`}`
`@@ -611,7 +611,7 @@ cppline{space}#.(\\{space}\n)\n*`
`611`	`611`
`612`	`612`	`/* initial definition */`
`613`	`613`	`this->old = old;`
`614`		`-/* this->new =mm_strdup(scanstr(literal));*/`
	`614`	`+/* this->new = scanstr(literal);*/`
`615`	`615`	`this->new =mm_strdup(literal);`
`616`	`616`	`this->next = defines;`
`617`	`617`	`defines =this;`

Comments

(0)