Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 27deb04

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

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
@@ -434,6 +434,12 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2)
434434
* This function initializes a single attribute structure in
435435
* a previously allocated tuple descriptor.
436436
*
437+
* If attributeName is NULL, the attname field is set to an empty string
438+
* (this is for cases where we don't know or need a name for the field).
439+
* Also, some callers use this function to change the datatype-related fields
440+
* in an existing tupdesc; they pass attributeName = NameStr(att->attname)
441+
* to indicate that the attname field shouldn't be modified.
442+
*
437443
* Note that attcollation is set to the default for the specified datatype.
438444
* If a nondefault collation is needed, insert it afterwards using
439445
* TupleDescInitEntryCollation.
@@ -467,12 +473,12 @@ TupleDescInitEntry(TupleDesc desc,
467473
/*
468474
* Note: attributeName can be NULL, because the planner doesn't always
469475
* fill in valid resname values in targetlists, particularly for resjunk
470-
* attributes.
476+
* attributes. Also, do nothing if caller wants to re-use the old attname.
471477
*/
472-
if (attributeName != NULL)
473-
namestrcpy(&(att->attname), attributeName);
474-
else
478+
if (attributeName == NULL)
475479
MemSet(NameStr(att->attname), 0, NAMEDATALEN);
480+
else if (attributeName != NameStr(att->attname))
481+
namestrcpy(&(att->attname), attributeName);
476482

477483
att->attstattarget = -1;
478484
att->attcacheoff = -1;

0 commit comments

Comments
 (0)