aboutsummaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-05-21 10:19:46 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-05-21 12:04:55 +0200
commitc9c15ac3162d10a999bf71418fd710bf5676175e (patch)
tree2264f9e56c7bad8288111a10ac2ff1aad8a317b3 /iconv
parent7e740ab2e7be7d83b75513aa406e0b10875f7f9c (diff)
downloadglibc-c9c15ac3162d10a999bf71418fd710bf5676175e.tar
glibc-c9c15ac3162d10a999bf71418fd710bf5676175e.tar.gz
glibc-c9c15ac3162d10a999bf71418fd710bf5676175e.tar.bz2
glibc-c9c15ac3162d10a999bf71418fd710bf5676175e.zip
wcsmbs: Fix data race in __wcsmbs_clone_conv [BZ #24584]
This also adds an overflow check and documents the synchronization requirement in <gconv.h>.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/iconv/gconv.h b/iconv/gconv.h
index 5ad26c06ac..7ce79bcbf6 100644
--- a/iconv/gconv.h
+++ b/iconv/gconv.h
@@ -86,6 +86,8 @@ struct __gconv_step
struct __gconv_loaded_object *__shlib_handle;
const char *__modname;
+ /* For internal use by glibc. (Accesses to this member must occur
+ when the internal __gconv_lock mutex is acquired). */
int __counter;
char *__from_name;