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 /storage/myisam/mi_key.c | |
| 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 'storage/myisam/mi_key.c')
| -rw-r--r-- | storage/myisam/mi_key.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c index 9247fae9e3c..1298232b5fa 100644 --- a/storage/myisam/mi_key.c +++ b/storage/myisam/mi_key.c @@ -144,8 +144,11 @@ uint _mi_make_key(register MI_INFO *info, uint keynr, uchar *key, set_if_smaller(length,tmp_length); FIX_LENGTH(cs, pos, length, char_length); store_key_length_inc(key,char_length); - memcpy((uchar*) key,(uchar*) pos,(size_t) char_length); - key+= char_length; + if (char_length) + { + memcpy(key, pos, char_length); + key+= char_length; + } continue; } else if (keyseg->flag & HA_SWAP_KEY) |