diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 14:19:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 14:19:21 +0200 |
| commit | 8036d0a3590dddf4d51ba02bc74ba3a5a96674f7 (patch) | |
| tree | 13fc7d26725fc5fd58a058b5d8563afef0835ae3 /sql/handler.h | |
| parent | d2fab686670fcc6d23930298e4256734dfdbc413 (diff) | |
| download | mariadb-git-8036d0a3590dddf4d51ba02bc74ba3a5a96674f7.tar.gz | |
MDEV-22387: Do not violate __attribute__((nonnull))
This follows up commit
commit 94a520ddbe39ae97de1135d98699cf2674e6b77e and
commit 7c5519c12d46ead947d341cbdcbb6fbbe4d4fe1b.
After these changes, the default test suites on a
cmake -DWITH_UBSAN=ON build no longer fail due to passing
null pointers as parameters that are declared to never be null,
but plenty of other runtime errors remain.
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index 0aa56afe1a5..96f2836c921 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -584,8 +584,10 @@ struct xid_t { void set(long f, const char *g, long gl, const char *b, long bl) { formatID= f; - memcpy(data, g, gtrid_length= gl); - memcpy(data+gl, b, bqual_length= bl); + if ((gtrid_length= gl)) + memcpy(data, g, gl); + if ((bqual_length= bl)) + memcpy(data+gl, b, bl); } void set(ulonglong xid) { |