diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 02:34:12 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 02:34:12 +0000 |
| commit | befadd75f8ff9f9b74a3f95296df360830dbf8b7 (patch) | |
| tree | 0b4ee41350042ed9bd9cbfba67973a2789fc0eba /third_party/libjpeg | |
| parent | da791b98a8993fa89ef0c36b82b03870c1915796 (diff) | |
| download | chromium_src-befadd75f8ff9f9b74a3f95296df360830dbf8b7.zip chromium_src-befadd75f8ff9f9b74a3f95296df360830dbf8b7.tar.gz chromium_src-befadd75f8ff9f9b74a3f95296df360830dbf8b7.tar.bz2 | |
Disable getenv() in libjpeg and libjpeg_turbo (roll to 238232)
getenv() is used in libjpeg and libjpeg_turbo to get environment
variable JPEGMEM which overrides the default max_memory setting from
jpeg_mem_init. However, getenv() is not thread-safe. Now libjpeg may
be called from multiple threads when impl-side-painting is enabled.
BUG=322228
TBR=cpu
Review URL: https://codereview.chromium.org/100483003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjpeg')
| -rw-r--r-- | third_party/libjpeg/libjpeg.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp index f8ce278..f22c859 100644 --- a/third_party/libjpeg/libjpeg.gyp +++ b/third_party/libjpeg/libjpeg.gyp @@ -11,6 +11,9 @@ { 'target_name': 'libjpeg', 'type': 'static_library', + 'defines': [ + 'NO_GETENV', # getenv() is not thread-safe. + ], 'sources': [ 'jcapimin.c', 'jcapistd.c', |