Clean up assorted failures under clang's -fsanitize=undefined checks.
Most of these are cases where we could call memcpy() or other libc
functions with a NULL pointer and a zero count, which is forbidden
by POSIX even though every production version of libc allows it.
We've fixed such things before in a piecemeal way, but apparently
never made an effort to try to get them all. I don't claim that
this patch does so either, but it gets every failure I observe in
check-world, using clang 12.0.1 on current RHEL8.
numeric.c has a different issue that the sanitizer doesn't like:
"ln(-1.0)" will compute log10(0) and then try to assign the
resulting -Inf to an integer variable. We don't actually use the
result in such a case, so there's no live bug.
Back-patch to all supported branches, with the idea that we might
start running a buildfarm member that tests this case. This includes
back-patching c1132aae3
(Check the size in COPY_POINTER_FIELD),
which previously silenced some of these issues in copyfuncs.c.
Discussion: https://postgr.es/m/CALNJ-vT9r0DSsAOw9OXVJFxLENoVS_68kJ5x0p44atoYH+H4dg@mail.gmail.com
This commit is contained in:
parent
62ce0c758d
commit
46ab07ffda
|
@ -198,7 +198,7 @@ combo_init(PX_Combo *cx, const uint8 *key, unsigned klen,
|
||||||
ivbuf = palloc0(ivs);
|
ivbuf = palloc0(ivs);
|
||||||
if (ivlen > ivs)
|
if (ivlen > ivs)
|
||||||
memcpy(ivbuf, iv, ivs);
|
memcpy(ivbuf, iv, ivs);
|
||||||
else
|
else if (ivlen > 0)
|
||||||
memcpy(ivbuf, iv, ivlen);
|
memcpy(ivbuf, iv, ivlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -328,7 +328,7 @@ initscan(HeapScanDesc scan, ScanKey key, bool keep_startblock)
|
||||||
/*
|
/*
|
||||||
* copy the scan key, if appropriate
|
* copy the scan key, if appropriate
|
||||||
*/
|
*/
|
||||||
if (key != NULL)
|
if (key != NULL && scan->rs_base.rs_nkeys > 0)
|
||||||
memcpy(scan->rs_base.rs_key, key, scan->rs_base.rs_nkeys * sizeof(ScanKeyData));
|
memcpy(scan->rs_base.rs_key, key, scan->rs_base.rs_nkeys * sizeof(ScanKeyData));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1564,8 +1564,8 @@ HeapTupleHeaderIsOnlyLocked(HeapTupleHeader tuple)
|
||||||
static bool
|
static bool
|
||||||
TransactionIdInArray(TransactionId xid, TransactionId *xip, Size num)
|
TransactionIdInArray(TransactionId xid, TransactionId *xip, Size num)
|
||||||
{
|
{
|
||||||
return bsearch(&xid, xip, num,
|
return num > 0 &&
|
||||||
sizeof(TransactionId), xidComparator) != NULL;
|
bsearch(&xid, xip, num, sizeof(TransactionId), xidComparator) != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -297,8 +297,9 @@ TransactionIdSetPageStatus(TransactionId xid, int nsubxids,
|
||||||
if (all_xact_same_page && xid == MyProc->xid &&
|
if (all_xact_same_page && xid == MyProc->xid &&
|
||||||
nsubxids <= THRESHOLD_SUBTRANS_CLOG_OPT &&
|
nsubxids <= THRESHOLD_SUBTRANS_CLOG_OPT &&
|
||||||
nsubxids == MyProc->subxidStatus.count &&
|
nsubxids == MyProc->subxidStatus.count &&
|
||||||
|
(nsubxids == 0 ||
|
||||||
memcmp(subxids, MyProc->subxids.xids,
|
memcmp(subxids, MyProc->subxids.xids,
|
||||||
nsubxids * sizeof(TransactionId)) == 0)
|
nsubxids * sizeof(TransactionId)) == 0))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* If we can immediately acquire XactSLRULock, we update the status of
|
* If we can immediately acquire XactSLRULock, we update the status of
|
||||||
|
|
|
@ -5353,6 +5353,7 @@ SerializeTransactionState(Size maxsize, char *start_address)
|
||||||
{
|
{
|
||||||
if (FullTransactionIdIsValid(s->fullTransactionId))
|
if (FullTransactionIdIsValid(s->fullTransactionId))
|
||||||
workspace[i++] = XidFromFullTransactionId(s->fullTransactionId);
|
workspace[i++] = XidFromFullTransactionId(s->fullTransactionId);
|
||||||
|
if (s->nChildXids > 0)
|
||||||
memcpy(&workspace[i], s->childXids,
|
memcpy(&workspace[i], s->childXids,
|
||||||
s->nChildXids * sizeof(TransactionId));
|
s->nChildXids * sizeof(TransactionId));
|
||||||
i += s->nChildXids;
|
i += s->nChildXids;
|
||||||
|
|
|
@ -773,8 +773,11 @@ shm_mq_receive(shm_mq_handle *mqh, Size *nbytesp, void **datap, bool nowait)
|
||||||
|
|
||||||
/* Copy as much as we can. */
|
/* Copy as much as we can. */
|
||||||
Assert(mqh->mqh_partial_bytes + rb <= nbytes);
|
Assert(mqh->mqh_partial_bytes + rb <= nbytes);
|
||||||
|
if (rb > 0)
|
||||||
|
{
|
||||||
memcpy(&mqh->mqh_buffer[mqh->mqh_partial_bytes], rawdata, rb);
|
memcpy(&mqh->mqh_buffer[mqh->mqh_partial_bytes], rawdata, rb);
|
||||||
mqh->mqh_partial_bytes += rb;
|
mqh->mqh_partial_bytes += rb;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Update count of bytes that can be consumed, accounting for
|
* Update count of bytes that can be consumed, accounting for
|
||||||
|
|
|
@ -10048,12 +10048,20 @@ exp_var(const NumericVar *arg, NumericVar *result, int rscale)
|
||||||
*
|
*
|
||||||
* Essentially, we're approximating log10(abs(ln(var))). This is used to
|
* Essentially, we're approximating log10(abs(ln(var))). This is used to
|
||||||
* determine the appropriate rscale when computing natural logarithms.
|
* determine the appropriate rscale when computing natural logarithms.
|
||||||
|
*
|
||||||
|
* Note: many callers call this before range-checking the input. Therefore,
|
||||||
|
* we must be robust against values that are invalid to apply ln() to.
|
||||||
|
* We don't wish to throw an error here, so just return zero in such cases.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
estimate_ln_dweight(const NumericVar *var)
|
estimate_ln_dweight(const NumericVar *var)
|
||||||
{
|
{
|
||||||
int ln_dweight;
|
int ln_dweight;
|
||||||
|
|
||||||
|
/* Caller should fail on ln(negative), but for the moment return zero */
|
||||||
|
if (var->sign != NUMERIC_POS)
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (cmp_var(var, &const_zero_point_nine) >= 0 &&
|
if (cmp_var(var, &const_zero_point_nine) >= 0 &&
|
||||||
cmp_var(var, &const_one_point_one) <= 0)
|
cmp_var(var, &const_one_point_one) <= 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -536,10 +536,12 @@ SetTransactionSnapshot(Snapshot sourcesnap, VirtualTransactionId *sourcevxid,
|
||||||
CurrentSnapshot->xmax = sourcesnap->xmax;
|
CurrentSnapshot->xmax = sourcesnap->xmax;
|
||||||
CurrentSnapshot->xcnt = sourcesnap->xcnt;
|
CurrentSnapshot->xcnt = sourcesnap->xcnt;
|
||||||
Assert(sourcesnap->xcnt <= GetMaxSnapshotXidCount());
|
Assert(sourcesnap->xcnt <= GetMaxSnapshotXidCount());
|
||||||
|
if (sourcesnap->xcnt > 0)
|
||||||
memcpy(CurrentSnapshot->xip, sourcesnap->xip,
|
memcpy(CurrentSnapshot->xip, sourcesnap->xip,
|
||||||
sourcesnap->xcnt * sizeof(TransactionId));
|
sourcesnap->xcnt * sizeof(TransactionId));
|
||||||
CurrentSnapshot->subxcnt = sourcesnap->subxcnt;
|
CurrentSnapshot->subxcnt = sourcesnap->subxcnt;
|
||||||
Assert(sourcesnap->subxcnt <= GetMaxSnapshotSubxidCount());
|
Assert(sourcesnap->subxcnt <= GetMaxSnapshotSubxidCount());
|
||||||
|
if (sourcesnap->subxcnt > 0)
|
||||||
memcpy(CurrentSnapshot->subxip, sourcesnap->subxip,
|
memcpy(CurrentSnapshot->subxip, sourcesnap->subxip,
|
||||||
sourcesnap->subxcnt * sizeof(TransactionId));
|
sourcesnap->subxcnt * sizeof(TransactionId));
|
||||||
CurrentSnapshot->suboverflowed = sourcesnap->suboverflowed;
|
CurrentSnapshot->suboverflowed = sourcesnap->suboverflowed;
|
||||||
|
|
|
@ -966,6 +966,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
|
||||||
|
|
||||||
more_col_wrapping = col_count;
|
more_col_wrapping = col_count;
|
||||||
curr_nl_line = 0;
|
curr_nl_line = 0;
|
||||||
|
if (col_count > 0)
|
||||||
memset(header_done, false, col_count * sizeof(bool));
|
memset(header_done, false, col_count * sizeof(bool));
|
||||||
while (more_col_wrapping)
|
while (more_col_wrapping)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue