walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Minor code fix to get rid of Coverity warning (I hope).

This commit is contained in:
Philip.Hazel 2018-08-21 11:27:35 +00:00
parent 1c6f2fc972
commit 5d12e53399
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pcre2_serialize.c
View File

@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel Written by Philip Hazel
Original API code Copyright (c) 1997-2012 University of Cambridge Original API code Copyright (c) 1997-2012 University of Cambridge
New API code Copyright (c) 2016-2017 University of Cambridge New API code Copyright (c) 2016-2018 University of Cambridge
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@ -133,14 +133,18 @@ for (i = 0; i < number_of_codes; i++)
deserialization. In order to ensure that the serialized data stream is always deserialization. In order to ensure that the serialized data stream is always
the same for the same pattern, set them to zero here. We can't assume the the same for the same pattern, set them to zero here. We can't assume the
copy of the pattern is correctly aligned for accessing the fields as part of copy of the pattern is correctly aligned for accessing the fields as part of
a structure. */ a structure. Note the use of sizeof(void *) in the second of these, to
specify the size of a pointer. If sizeof(uint8_t *) is used (tables is a
pointer to uint8_t), gcc gives a warning because the first argument is also a
pointer to uint8_t. Casting the first argument to (void *) can stop this, but
it didn't stop Coverity giving the same complaint. */
(void)memset((void *)(dst_bytes + offsetof(pcre2_real_code, memctl)), 0, (void)memset(dst_bytes + offsetof(pcre2_real_code, memctl), 0,
sizeof(pcre2_memctl)); sizeof(pcre2_memctl));
(void)memset((void *)(dst_bytes + offsetof(pcre2_real_code, tables)), 0, (void)memset(dst_bytes + offsetof(pcre2_real_code, tables), 0,
sizeof(uint8_t *)); sizeof(void *));
(void)memset((void *)(dst_bytes + offsetof(pcre2_real_code, executable_jit)), (void)memset(dst_bytes + offsetof(pcre2_real_code, executable_jit), 0,
0, sizeof(void *)); sizeof(void *));
dst_bytes += re->blocksize; dst_bytes += re->blocksize;
} }