[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 689 Low Browser crash with NULL pointer in web worker handling. Credit to

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 689
Revision Id: iuculano at debian.org-20101218123546-79y3kuoz1eiuy1pr
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Low Browser crash with NULL pointer in web worker handling. Credit to 
Nathan Weizenbaum of Google.


--------------------------------------------------------
  ** Added :
        - debian/patches/63529.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-12-18 12:12:07 +0000
+++ b/debian/changelog	2010-12-18 12:35:46 +0000
@@ -3,8 +3,10 @@
   * Backported security patches from stable:
     - [64-bit Linux only] High Bad validation for message deserialization on
       64-bit builds. Credit to Lei Zhang of the Chromium development community.
+    - Low Browser crash with NULL pointer in web worker handling. Credit to 
+      Nathan Weizenbaum of Google.
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 18 Dec 2010 13:11:38 +0100
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 18 Dec 2010 13:31:49 +0100
 
 chromium-browser (6.0.472.63~r59945-3) unstable; urgency=high
 

=== added file 'debian/patches/63529.patch'
--- a/debian/patches/63529.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/63529.patch	2010-12-18 12:35:46 +0000
@@ -0,0 +1,36 @@
+--- a/src/chrome/browser/worker_host/message_port_dispatcher.cc
++++ b/src/chrome/browser/worker_host/message_port_dispatcher.cc
+@@ -192,11 +192,13 @@ void MessagePortDispatcher::PostMessageT
+       sent_ports[i]->route_id = new_routing_ids[i];
+     }
+ 
+-    // Now send the message to the entangled port.
+-    IPC::Message* ipc_msg = new WorkerProcessMsg_Message(
+-        entangled_port.route_id, message, sent_message_port_ids,
+-        new_routing_ids);
+-    entangled_port.sender->Send(ipc_msg);
++    if (entangled_port.sender) {
++      // Now send the message to the entangled port
++      IPC::Message* ipc_msg = new WorkerProcessMsg_Message(
++	  entangled_port.route_id, message, sent_message_port_ids,
++	  new_routing_ids);
++      entangled_port.sender->Send(ipc_msg);
++    }
+   }
+   DCHECK(CheckMessagePortMap(true));
+ }
+@@ -209,9 +211,11 @@ void MessagePortDispatcher::OnQueueMessa
+   }
+ 
+   MessagePort& port = message_ports_[message_port_id];
+-  port.sender->Send(new WorkerProcessMsg_MessagesQueued(port.route_id));
+-  port.queue_messages = true;
+-  port.sender = NULL;
++  if (port.sender) {
++    port.sender->Send(new WorkerProcessMsg_MessagesQueued(port.route_id));
++    port.queue_messages = true;
++    port.sender = NULL;
++  }
+   DCHECK(CheckMessagePortMap(true));
+ }
+ 

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-12-18 12:12:07 +0000
+++ b/debian/patches/series	2010-12-18 12:35:46 +0000
@@ -38,3 +38,4 @@
 62401.patch
 63051.patch
 56449.patch
+63529.patch