# HG changeset patch
# User Benjamin Peterson <benjamin@python.org>
# Date 1453357506 28800
# Node ID 10dad6da1b28ea4af78ad9529e469fdbf4ebbc8f
# Parent  a3ac2cd93db9d5336dfd7b5b27efde2c568d8794# Parent  01ddd608b85c85952537d95a43bbabf4fb655057
merge 3.4 (#26171)

Upstream-Status: Backport
CVE: CVE-2016-5636

https://hg.python.org/cpython/raw-rev/10dad6da1b28
Signed-off-by: Armin Kuster <akuster@mvista.com>

Index: Python-3.5.1/Misc/NEWS
===================================================================
--- Python-3.5.1.orig/Misc/NEWS
+++ Python-3.5.1/Misc/NEWS
@@ -91,6 +91,9 @@ Core and Builtins
   Python.h header to fix a compilation error with OpenMP. PyThreadState_GET()
   becomes an alias to PyThreadState_Get() to avoid ABI incompatibilies.
 
+- Issue #26171: Fix possible integer overflow and heap corruption in
+  zipimporter.get_data().
+
 Library
 -------
 
Index: Python-3.5.1/Modules/zipimport.c
===================================================================
--- Python-3.5.1.orig/Modules/zipimport.c
+++ Python-3.5.1/Modules/zipimport.c
@@ -1112,6 +1112,11 @@ get_data(PyObject *archive, PyObject *to
     }
     file_offset += l;           /* Start of file data */
 
+    if (data_size > LONG_MAX - 1) {
+        fclose(fp);
+        PyErr_NoMemory();
+        return NULL;
+    }
     bytes_size = compress == 0 ? data_size : data_size + 1;
     if (bytes_size == 0)
         bytes_size++;
-oe.git/refs/?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>refs</a><a class='active' href='/cgit/multitech-oe.git/log/recipes/gnome/gconf-editor_2.22.0.bb'>log</a><a href='/cgit/multitech-oe.git/tree/recipes/gnome/gconf-editor_2.22.0.bb?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>tree</a><a href='/cgit/multitech-oe.git/commit/recipes/gnome/gconf-editor_2.22.0.bb?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>commit</a><a href='/cgit/multitech-oe.git/diff/recipes/gnome/gconf-editor_2.22.0.bb?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/recipes/gnome/gconf-editor_2.22.0.bb'>
<input type='hidden' name='id' value='ebd05b466bac1c28d37e243030959b7ef9b6ec26'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/multitech-oe.git/log/?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>root</a>/<a href='/cgit/multitech-oe.git/log/recipes?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>recipes</a>/<a href='/cgit/multitech-oe.git/log/recipes/gnome?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>gnome</a>/<a href='/cgit/multitech-oe.git/log/recipes/gnome/gconf-editor_2.22.0.bb?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26'>gconf-editor_2.22.0.bb</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit/multitech-oe.git/log/recipes/gnome/gconf-editor_2.22.0.bb?id=ebd05b466bac1c28d37e243030959b7ef9b6ec26&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2009-10-14 14:09:25 +0200'>2009-10-14</span></td><td><a href='/cgit/multitech-oe.git/commit/recipes/gnome/gconf-editor_2.22.0.bb?id=576e3eca83ac41ac1b00f9bb87c834c850d52945'>gnome: start cleaning up gconf providers</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2009-03-17 14:32:59 -0400'>2009-03-17</span></td><td><a href='/cgit/multitech-oe.git/commit/recipes/gnome/gconf-editor_2.22.0.bb?id=709c4d66e0b107ca606941b988bad717c0b45d9b'>rename packages/ to recipes/ per earlier agreement</a></td><td>Denys Dmytriyenko</td><td>1</td></tr>
/packages/totem?id=4820ffb15f183a7fbe9ee074ee139def6dd34fc2'>fixed SRC_URI with part of patch from bug#191</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-08-01 14:15:54 +0000'>2005-08-01</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/totem?id=0bd6a7b89f81b97120760916bc6fad5ee5042cd2'>added totem 0.101 - BROKEN due to lack of 'libnautilus-burn' package (or opti...</a></td><td>Marcin Juszkiewicz</td><td>4</td></tr>
<tr><td><span title='2005-08-01 14:14:48 +0000'>2005-08-01</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/totem?id=34f09a6ee266d39ef86c438fcb0cbad0faabc36f'>marked totem 0.99.15 as BROKEN - it is not fetchable</a></td><td>Marcin Juszkiewicz</td><td>1</td></tr>
<tr><td><span title='2005-06-30 08:19:37 +0000'>2005-06-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/totem?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>5</td></tr>
<tr><td><span title='2004-12-09 09:47:41 +0000'>2004-12-09</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/totem?id=2c5b8ec6d95cf68650265941530e5ce38c8dd6d9'>Merge oe-devel@oe-devel.bkbits.net:openembedded</a></td><td>Chris Larson</td><td>3</td></tr>
><span title='2006-07-02 15:24:29 +0000'>2006-07-02</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-icon-reload?id=8d9c2a3d933e3b957a687982d36bd5c5072c2022'>Opie: Rename Opie 1.2.1 to 1.2.2, Remove PRs</a></td><td>Holger Freyther</td><td>2</td></tr>
<tr><td><span title='2006-01-12 22:20:11 +0000'>2006-01-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-icon-reload?id=990bc95f725a7da3a74a7ea86f2ef11ba143aa1c'>Correct Opie PV format to preserve upgradability of packages but note where c...</a></td><td>Richard Purdie</td><td>2</td></tr>
<tr><td><span title='2006-01-07 21:42:26 +0000'>2006-01-07</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-icon-reload?id=b6079b6c268d8df773e42a191f12c9afcd17d1c6'>Convert CVSDATE -&gt; SRCDATE. Also standardise cvs and svn PVs to x.x.x+cvsYYYY...</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr><td><span title='2005-09-12 18:15:03 +0000'>2005-09-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-icon-reload?id=c0d3aa46af8159efdbe9e6b95a74dae11701fd86'>Opie 1.2.1:</a></td><td>Holger Freyther</td><td>2</td></tr>
<tr><td><span title='2005-06-30 08:19:37 +0000'>2005-06-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/opie-icon-reload?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>7</td></tr>