[Pkg-chromium-commit] chromium-browser/chromium-browser.squeeze: 705 Low Browser crash with bad volume setting. Credit to Matthew Heidermann.

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.squeeze
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.squeeze
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 705
Revision Id: iuculano at debian.org-20110206120709-jjsgksoom35szzw4
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Low Browser crash with bad volume setting. Credit to Matthew Heidermann.


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

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

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2011-02-06 11:44:32 +0000
+++ b/debian/changelog	2011-02-06 12:07:09 +0000
@@ -3,8 +3,9 @@
   * Backported security patches from stable:
     - High Use-after-free in image loading. Credit to Aki Helin of OUSPG
     - Low Browser crash with extension with missing key. Credit to Brian Kirchoff.
+    - Low Browser crash with bad volume setting. Credit to Matthew Heidermann.
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sun, 06 Feb 2011 12:43:46 +0100
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sun, 06 Feb 2011 13:06:24 +0100
 
 chromium-browser (6.0.472.63~r59945-5) unstable; urgency=high
 

=== added file 'debian/patches/68244.patch'
--- a/debian/patches/68244.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/68244.patch	2011-02-06 12:07:09 +0000
@@ -0,0 +1,34 @@
+--- a/src/chrome/browser/renderer_host/audio_renderer_host.cc
++++ b/src/chrome/browser/renderer_host/audio_renderer_host.cc
+@@ -455,7 +455,8 @@ void AudioRendererHost::OnSetVolume(cons
+   }
+ 
+   // Make sure the volume is valid.
+-  CHECK(volume >= 0 && volume <= 1.0);
++  if (volume < 0 || volume > 1.0)
++      return;
+   entry->controller->SetVolume(volume);
+ }
+ 
+--- a/src/media/audio/audio_util.cc
++++ b/src/media/audio/audio_util.cc
+@@ -93,7 +93,8 @@ bool AdjustVolume(void* buf,
+                   int bytes_per_sample,
+                   float volume) {
+   DCHECK(buf);
+-  DCHECK(volume >= 0.0f && volume <= 1.0f);
++  if (volume < 0.0f || volume > 1.0f)
++      return false;
+   if (volume == 1.0f) {
+     return true;
+   } else if (volume == 0.0f) {
+@@ -129,7 +130,8 @@ bool FoldChannels(void* buf,
+                   int bytes_per_sample,
+                   float volume) {
+   DCHECK(buf);
+-  DCHECK(volume >= 0.0f && volume <= 1.0f);
++  if (volume < 0.0f || volume > 1.0f)
++      return false;
+   if (channels >= 5 && channels <= 6 && bytes_per_sample > 0) {
+     int sample_count = buflen / (channels * bytes_per_sample);
+     if (bytes_per_sample == 1) {

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2011-02-06 11:44:32 +0000
+++ b/debian/patches/series	2011-02-06 12:07:09 +0000
@@ -51,3 +51,4 @@
 68439.patch
 55831.patch
 59081.patch
+68244.patch