svn commit: r257039 - stable/10/lib/libc/iconv
Xin LI
delphij at FreeBSD.org
Thu Oct 24 05:01:49 UTC 2013
Author: delphij
Date: Thu Oct 24 05:01:49 2013
New Revision: 257039
URL: http://svnweb.freebsd.org/changeset/base/257039
Log:
MFC r256833:
Drop cm_lock before calling mapper_close, which in turn could call
_citrus_mapper_close again and result in a deadlock otherwise.
This is similar to NetBSD PR/24023 (fixed in their r1.5 of this file).
PR: bin/182994
Submitted by: Fabian Keil <fk fabiankeil de>
Approved by: re (hrs)
Modified:
stable/10/lib/libc/iconv/citrus_mapper.c
Directory Properties:
stable/10/lib/libc/ (props changed)
Modified: stable/10/lib/libc/iconv/citrus_mapper.c
==============================================================================
--- stable/10/lib/libc/iconv/citrus_mapper.c Thu Oct 24 03:36:39 2013 (r257038)
+++ stable/10/lib/libc/iconv/citrus_mapper.c Thu Oct 24 05:01:49 2013 (r257039)
@@ -381,7 +381,9 @@ _citrus_mapper_close(struct _citrus_mapp
_CITRUS_HASH_REMOVE(cm, cm_entry);
free(cm->cm_key);
}
+ UNLOCK(&cm_lock);
mapper_close(cm);
+ return;
quit:
UNLOCK(&cm_lock);
}
More information about the svn-src-stable-10
mailing list