Merge r82494 from the python2.6 branch:

Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, ensure that the input string length is a multiple of the frame size

Merge r82494 from the python2.6 branch:
Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module, ensure that the input string length is a multiple of the frame size
9f24c736 · Matthias Klose · cca7b7f0 · 9f24c736 · 9f24c736
Commit 9f24c736 authored Oct 17, 2010 by Matthias Klose
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 74 additions and 73 deletions

Misc/NEWS Misc/NEWS +3 -0

Modules/audioop.c Modules/audioop.c +71 -73

No files found.
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Library
 - Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing
  overflow checks in the audioop module (CVE-2010-1634).

+- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
+  module, ensure that the input string length is a multiple of the frame size.
+

 What's New in Python 2.5.5?
 ===========================

--- a/Modules/audioop.c
+++ b/Modules/audioop.c