Virtualization
/
brotli
mirror of https://github.com/google/brotli
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add missing "const" to a couple of kConstants (#780) 

These showed up in a Chromium audit:
https://bugs.chromium.org/p/chromium/issues/detail?id=747064#c8

Although already effectively const, adding "const" causes the symbols to
be moved into the read-only section of the binary.
This commit is contained in:
agrieve 2019-12-19 18:15:58 -05:00 committed by Eugene Kliuchnikov
parent c435f06675
commit 4b5771bee7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
c/common/dictionary.c
View File

@ -5,12 +5,13 @@
*/ */
#include "./dictionary.h" #include "./dictionary.h"
#include "./platform.h"
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
extern "C" { extern "C" {
#endif #endif
#ifndef BROTLI_EXTERNAL_DICTIONARY_DATA #if !defined(BROTLI_EXTERNAL_DICTIONARY_DATA)
static const uint8_t kBrotliDictionaryData[] = static const uint8_t kBrotliDictionaryData[] =
{ {
116,105,109,101,100,111,119,110,108,105,102,101,108,101,102,116,98,97,99,107,99, 116,105,109,101,100,111,119,110,108,105,102,101,108,101,102,116,98,97,99,107,99,
@ -5862,7 +5863,11 @@ static const uint8_t kBrotliDictionaryData[] =
; ;
#endif /* !BROTLI_EXTERNAL_DICTIONARY_DATA */ #endif /* !BROTLI_EXTERNAL_DICTIONARY_DATA */
#if !defined(BROTLI_EXTERNAL_DICTIONARY_DATA)
static const BrotliDictionary kBrotliDictionary = {
#else
static BrotliDictionary kBrotliDictionary = { static BrotliDictionary kBrotliDictionary = {
#endif
/* size_bits_by_length */ /* size_bits_by_length */
{ {
0, 0, 0, 0, 10, 10, 11, 11, 0, 0, 0, 0, 10, 10, 11, 11,
@ -5895,9 +5900,13 @@ const BrotliDictionary* BrotliGetDictionary() {
} }
void BrotliSetDictionaryData(const uint8_t* data) { void BrotliSetDictionaryData(const uint8_t* data) {
#if defined(BROTLI_EXTERNAL_DICTIONARY_DATA)
if (!!data && !kBrotliDictionary.data) { if (!!data && !kBrotliDictionary.data) {
kBrotliDictionary.data = data; kBrotliDictionary.data = data;
} }
#else
BROTLI_UNUSED(data); // Appease -Werror=unused-parameter
#endif
} }
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)

2
c/common/transform.c
View File

@ -160,7 +160,7 @@ static const uint8_t kTransformsData[] = {
0, BROTLI_TRANSFORM_UPPERCASE_FIRST, 34, 0, BROTLI_TRANSFORM_UPPERCASE_FIRST, 34,
}; };
static BrotliTransforms kBrotliTransforms = { static const BrotliTransforms kBrotliTransforms = {
sizeof(kPrefixSuffix), sizeof(kPrefixSuffix),
(const uint8_t*)kPrefixSuffix, (const uint8_t*)kPrefixSuffix,
kPrefixSuffixMap, kPrefixSuffixMap,