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

Commitaad45bd

Browse files
committed
Prevent using strncpy with src == dest in TupleDescInitEntry.
The C and POSIX standards state that strncpy's behavior is undefined whensource and destination areas overlap. While it remains dubious whether anyimplementations really misbehave when the pointers are exactly equal, someplatforms are now starting to force the issue by complaining when anundefined call occurs. (In particular OS X 10.9 has been seen to dump corehere, though the exact set of circumstances needed to trigger that remainelusive. Similar behavior can be expected to be optional on Linux andother platforms in the near future.) So tweak the code to explicitly donothing when nothing need be done.Back-patch to all active branches. In HEAD, this also lets us get rid ofan exception in valgrind.supp.Per discussion of a report from Matthias Schmitt.
1 parent42ef7c8 commitaad45bd

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

‎src/backend/access/common/tupdesc.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,12 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2)
427427
* TupleDescInitEntry
428428
*This function initializes a single attribute structure in
429429
*a previously allocated tuple descriptor.
430+
*
431+
* If attributeName is NULL, the attname field is set to an empty string
432+
* (this is for cases where we don't know or need a name for the field).
433+
* Also, some callers use this function to change the datatype-related fields
434+
* in an existing tupdesc; they pass attributeName = NameStr(att->attname)
435+
* to indicate that the attname field shouldn't be modified.
430436
*/
431437
void
432438
TupleDescInitEntry(TupleDescdesc,
@@ -457,12 +463,12 @@ TupleDescInitEntry(TupleDesc desc,
457463
/*
458464
* Note: attributeName can be NULL, because the planner doesn't always
459465
* fill in valid resname values in targetlists, particularly for resjunk
460-
* attributes.
466+
* attributes. Also, do nothing if caller wants to re-use the old attname.
461467
*/
462-
if (attributeName!=NULL)
463-
namestrcpy(&(att->attname),attributeName);
464-
else
468+
if (attributeName==NULL)
465469
MemSet(NameStr(att->attname),0,NAMEDATALEN);
470+
elseif (attributeName!=NameStr(att->attname))
471+
namestrcpy(&(att->attname),attributeName);
466472

467473
att->attstattarget=-1;
468474
att->attcacheoff=-1;

0 commit comments

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