Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita2969bd

Browse files
committed
Fix off-by-one loop count in MapArrayTypeName, and get rid of static array.
MapArrayTypeName would copy up to NAMEDATALEN-1 bytes of the base typename, which of course is wrong: after prepending '_' there is only room forNAMEDATALEN-2 bytes. Aside from being the wrong result, this case wouldlead to overrunning the statically allocated work buffer. This would be asecurity bug if the function were ever used outside bootstrap mode, but itisn't, at least not in any currently supported branches.Aside from fixing the off-by-one loop logic, this patch gets rid of thestatic work buffer by having MapArrayTypeName pstrdup its result; the solecaller was already doing that, so this just requires moving the pstrdupcall. This saves a few bytes but mainly it makes the API a lot cleaner.Back-patch on the off chance that there is some third-party code usingMapArrayTypeName with less-secure input. Pushing pstrdup into the functionshould not cause any serious problems for such hypothetical code; at worstthere might be a short term memory leak.Per Coverity scanning.
1 parent961df18 commita2969bd

File tree

3 files changed

+15
-20
lines changed

3 files changed

+15
-20
lines changed

‎src/backend/bootstrap/bootscanner.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ insert{ return(INSERT_TUPLE); }
104104
"toast"{return(XTOAST); }
105105

106106
{arrayid}{
107-
yylval.str =pstrdup(MapArrayTypeName(yytext));
107+
yylval.str =MapArrayTypeName(yytext);
108108
return(ID);
109109
}
110110
{id}{

‎src/backend/bootstrap/bootstrap.c

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,38 +1009,33 @@ AllocateAttribute(void)
10091009
returnattribute;
10101010
}
10111011

1012-
/* ----------------
1012+
/*
10131013
*MapArrayTypeName
1014-
* XXX arrays of "basetype" are always "_basetype".
1015-
* this is an evil hack inherited from rel. 3.1.
1016-
* XXX array dimension is thrown away because we
1017-
* don't support fixed-dimension arrays. again,
1018-
* sickness from 3.1.
10191014
*
1020-
* the string passed in must have a '[' character in it
1015+
* Given a type name, produce the corresponding array type name by prepending
1016+
* '_' and truncating as needed to fit in NAMEDATALEN-1 bytes. This is only
1017+
* used in bootstrap mode, so we can get away with assuming that the input is
1018+
* ASCII and we don't need multibyte-aware truncation.
10211019
*
1022-
*thestringreturned is a pointer to static storage and should NOT
1023-
* be freed by the CALLER.
1024-
*----------------
1020+
*The givenstringnormally ends with '[]' or '[digits]'; we discard that.
1021+
*
1022+
*The result is a palloc'd string.
10251023
*/
10261024
char*
1027-
MapArrayTypeName(char*s)
1025+
MapArrayTypeName(constchar*s)
10281026
{
10291027
inti,
10301028
j;
1031-
staticcharnewStr[NAMEDATALEN];/* array type names < NAMEDATALEN long */
1029+
charnewStr[NAMEDATALEN];
10321030

1033-
if (s==NULL||s[0]=='\0')
1034-
returns;
1035-
1036-
j=1;
10371031
newStr[0]='_';
1038-
for (i=0;i<NAMEDATALEN-1&&s[i]!='[';i++,j++)
1032+
j=1;
1033+
for (i=0;i<NAMEDATALEN-2&&s[i]!='[';i++,j++)
10391034
newStr[j]=s[i];
10401035

10411036
newStr[j]='\0';
10421037

1043-
returnnewStr;
1038+
returnpstrdup(newStr);
10441039
}
10451040

10461041

‎src/include/bootstrap/bootstrap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ extern void InsertOneTuple(Oid objectid);
5151
externvoidInsertOneValue(char*value,inti);
5252
externvoidInsertOneNull(inti);
5353

54-
externchar*MapArrayTypeName(char*s);
54+
externchar*MapArrayTypeName(constchar*s);
5555

5656
externvoidindex_register(Oidheap,Oidind,IndexInfo*indexInfo);
5757
externvoidbuild_indices(void);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp