/hg/icedtea-web: 2 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Wed Nov 24 12:24:12 PST 2010
changeset a9d3a1d07478 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a9d3a1d07478
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Nov 24 15:17:54 2010 -0500
Fix PR552: Support for FreeBSD's pthread implementation (patch from
jkim at freebsd.org)
changeset 5267f9104d5f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5267f9104d5f
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Nov 24 15:22:03 2010 -0500
Fix PR593: Increment of invalidated iterator in IcedTeaPluginUtils
(patch from barbara.xxx1975 at libero.it)
diffstat:
5 files changed, 65 insertions(+), 6 deletions(-)
ChangeLog | 22 +++++++++++++
NEWS | 2 +
plugin/icedteanp/IcedTeaNPPlugin.cc | 4 ++
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 35 ++++++++++++++++++---
plugin/icedteanp/IcedTeaPluginUtils.cc | 8 +++-
diffs (160 lines):
diff -r b43d21667b5b -r 5267f9104d5f ChangeLog
--- a/ChangeLog Wed Nov 24 20:06:11 2010 +0000
+++ b/ChangeLog Wed Nov 24 15:22:03 2010 -0500
@@ -1,3 +1,25 @@ 2010-11-24 Andrew John Hughes <ahughes
+2010-11-24 Deepak Bhole <dbhole at redhat.com>
+
+ Fix PR593: Increment of invalidated iterator in IcedTeaPluginUtils (patch
+ from barbara.xxx1975 at libero.it)
+ * plugin/icedteanp/IcedTeaPluginUtils.cc
+ (invalidateInstance): Act on the pointer directly, rather than via
+ members.
+ * NEWS: Updated.
+
+2010-11-24 Deepak Bhole <dbhole at redhat.com>
+
+ Fix PR552: Support for FreeBSD's pthread implementation (patch from
+ jkim at freebsd.org)
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (NP_Shutdown): Do pthread_join after cancel to avoid destroying mutexes
+ or condition variables in use.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (PluginRequestProcessor): Initialize mutexes dynamically.
+ (queue_cleanup): New method. Destroy dynamically created mytexes.
+ (queue_processor): Initialize wait_mutex and push cleanup on exit. Clean
+ up after processing stops.
+
2010-11-24 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Bring in changes from IcedTea6 1.10
diff -r b43d21667b5b -r 5267f9104d5f NEWS
--- a/NEWS Wed Nov 24 20:06:11 2010 +0000
+++ b/NEWS Wed Nov 24 15:22:03 2010 -0500
@@ -15,10 +15,12 @@ New in release 1.0 (2010-XX-XX):
- RH645843, CVE-2010-3860: IcedTea System property information leak via public static
* Plugin
- PR542: Plugin fails with NPE on http://www.openprocessing.org/visuals/iframe.php?visualID=2615
+ - PR552: Support for FreeBSD's pthread implementation
- PR554: System.err writes content two times
- PR556: Applet initialization code is prone to race conditions
- PR557: Applet opens in a separate window if tab is closed when the applet loads
- PR565: UIDefaults.getUI fails with jgoodies:looks 2.3.1
+ - PR593: Increment of invalidated iterator in IcedTeaPluginUtils (patch from barbara.xxx1975 at libero.it)
- Applets are now double-buffered to eliminate flicker in ones that do heavy drawing
* NetX
- Add a new option -Xclearcache
diff -r b43d21667b5b -r 5267f9104d5f plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Nov 24 20:06:11 2010 +0000
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Nov 24 15:22:03 2010 -0500
@@ -2372,6 +2372,10 @@ NP_Shutdown (void)
pthread_cancel(plugin_request_processor_thread2);
pthread_cancel(plugin_request_processor_thread3);
+ pthread_join(plugin_request_processor_thread1, NULL);
+ pthread_join(plugin_request_processor_thread2, NULL);
+ pthread_join(plugin_request_processor_thread3, NULL);
+
java_to_plugin_bus->unSubscribe(plugin_req_proc);
plugin_to_java_bus->unSubscribe(java_req_proc);
//internal_bus->unSubscribe(java_req_proc);
diff -r b43d21667b5b -r 5267f9104d5f plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Nov 24 20:06:11 2010 +0000
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Nov 24 15:22:03 2010 -0500
@@ -63,6 +63,12 @@ PluginRequestProcessor::PluginRequestPro
this->pendingRequests = new std::map<pthread_t, uintmax_t>();
internal_req_ref_counter = 0;
+
+ pthread_mutex_init(&message_queue_mutex, NULL);
+ pthread_mutex_init(&syn_write_mutex, NULL);
+ pthread_mutex_init(&tc_mutex, NULL);
+
+ pthread_cond_init(&cond_message_available, NULL);
}
/**
@@ -77,6 +83,12 @@ PluginRequestProcessor::~PluginRequestPr
if (pendingRequests)
delete pendingRequests;
+
+ pthread_mutex_destroy(&message_queue_mutex);
+ pthread_mutex_destroy(&syn_write_mutex);
+ pthread_mutex_destroy(&tc_mutex);
+
+ pthread_cond_destroy(&cond_message_available);
}
/**
@@ -701,6 +713,14 @@ PluginRequestProcessor::finalize(std::ve
plugin_to_java_bus->post(response.c_str());
}
+static void
+queue_cleanup(void* data)
+{
+
+ pthread_mutex_destroy((pthread_mutex_t*) data);
+
+ PLUGIN_DEBUG("Queue processing stopped.\n");
+}
void*
queue_processor(void* data)
@@ -709,9 +729,13 @@ queue_processor(void* data)
PluginRequestProcessor* processor = (PluginRequestProcessor*) data;
std::vector<std::string*>* message_parts = NULL;
std::string command;
- pthread_mutex_t wait_mutex = PTHREAD_MUTEX_INITIALIZER; // This is needed for API compat. and is unused
+ pthread_mutex_t wait_mutex = PTHREAD_MUTEX_INITIALIZER;
PLUGIN_DEBUG("Queue processor initialized. Queue = %p\n", message_queue);
+
+ pthread_mutex_init(&wait_mutex, NULL);
+
+ pthread_cleanup_push(queue_cleanup, (void*) &wait_mutex);
while (true)
{
@@ -780,14 +804,17 @@ queue_processor(void* data)
} else
{
- pthread_cond_wait(&cond_message_available, &wait_mutex);
- pthread_testcancel();
+ pthread_mutex_lock(&wait_mutex);
+ pthread_cond_wait(&cond_message_available, &wait_mutex);
+ pthread_mutex_unlock(&wait_mutex);
}
message_parts = NULL;
+
+ pthread_testcancel();
}
- PLUGIN_DEBUG("Queue processing stopped.\n");
+ pthread_cleanup_pop(1);
}
/******************************************
diff -r b43d21667b5b -r 5267f9104d5f plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Nov 24 20:06:11 2010 +0000
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Nov 24 15:22:03 2010 -0500
@@ -510,11 +510,15 @@ IcedTeaPluginUtilities::invalidateInstan
std::map<void*,NPP>::iterator iterator;
- for (iterator = instance_map->begin(); iterator != instance_map->end(); iterator++)
+ for (iterator = instance_map->begin(); iterator != instance_map->end(); )
{
if ((*iterator).second == instance)
{
- instance_map->erase((*iterator).first);
+ instance_map->erase(iterator++);
+ }
+ else
+ {
+ ++iterator;
}
}
}
More information about the distro-pkg-dev
mailing list