From fccd80a7d35b9eefabcc384d5c9fe89d9545dd22 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Tue, 22 Sep 2015 16:23:21 +0800 Subject: Upstream post release cherry-picks --- .../0009-xmlMemUsed-is-not-thread-safe.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 debian/patches/0009-xmlMemUsed-is-not-thread-safe.patch (limited to 'debian/patches/0009-xmlMemUsed-is-not-thread-safe.patch') diff --git a/debian/patches/0009-xmlMemUsed-is-not-thread-safe.patch b/debian/patches/0009-xmlMemUsed-is-not-thread-safe.patch new file mode 100644 index 0000000..03a8f4f --- /dev/null +++ b/debian/patches/0009-xmlMemUsed-is-not-thread-safe.patch @@ -0,0 +1,42 @@ +From: Martin von Gagern +Date: Mon, 13 Apr 2015 16:32:14 +0800 +Subject: xmlMemUsed is not thread-safe + +For https://bugzilla.gnome.org/show_bug.cgi?id=747437 +just use the mutex to protect access to those variables +--- + xmlmemory.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/xmlmemory.c b/xmlmemory.c +index a3dc737..f24fd6d 100644 +--- a/xmlmemory.c ++++ b/xmlmemory.c +@@ -554,7 +554,12 @@ xmlMemoryStrdup(const char *str) { + + int + xmlMemUsed(void) { +- return(debugMemSize); ++ int res; ++ ++ xmlMutexLock(xmlMemMutex); ++ res = debugMemSize; ++ xmlMutexUnlock(xmlMemMutex); ++ return(res); + } + + /** +@@ -567,7 +572,12 @@ xmlMemUsed(void) { + + int + xmlMemBlocks(void) { +- return(debugMemBlocks); ++ int res; ++ ++ xmlMutexLock(xmlMemMutex); ++ res = debugMemBlocks; ++ xmlMutexUnlock(xmlMemMutex); ++ return(res); + } + + #ifdef MEM_LIST -- cgit v1.2.3