mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-05-18 22:57:30 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
# HG changeset patch
|
|
# User Benjamin Peterson <benjamin@python.org>
|
|
# Date 1397441438 14400
|
|
# Node ID 50c07ed1743da9cd4540d83de0c30bd17aeb41b0
|
|
# Parent 218e28a935ab4494d05215c243e2129625a71893
|
|
in scan_once, prevent the reading of arbitrary memory when passed a negative index
|
|
|
|
Bug reported by Guido Vranken.
|
|
|
|
Index: Python-3.3.5/Lib/json/tests/test_decode.py
|
|
===================================================================
|
|
--- Python-3.3.5.orig/Lib/test/test_json/test_decode.py 2014-06-26 18:40:10.825269130 +0200
|
|
+++ Python-3.3.5/Lib/test/test_json/test_decode.py 2014-06-26 18:40:21.962323035 +0200
|
|
@@ -60,5 +60,10 @@
|
|
msg = 'escape'
|
|
self.assertRaisesRegexp(ValueError, msg, self.loads, s)
|
|
|
|
+ def test_negative_index(self):
|
|
+ d = self.json.JSONDecoder()
|
|
+ self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
|
|
+ self.assertRaises(ValueError, d.raw_decode, u'a'*42, -50000)
|
|
+
|
|
class TestPyDecode(TestDecode, PyTest): pass
|
|
class TestCDecode(TestDecode, CTest): pass
|
|
Index: Python-3.3.5/Misc/ACKS
|
|
===================================================================
|
|
--- Python-3.3.5.orig/Misc/ACKS 2014-06-26 18:40:10.826269135 +0200
|
|
+++ Python-3.3.5/Misc/ACKS 2014-06-26 18:40:21.962323035 +0200
|
|
@@ -1085,6 +1085,7 @@
|
|
Frank Visser
|
|
Johannes Vogel
|
|
Alex Volkov
|
|
+Guido Vranken
|
|
Martijn Vries
|
|
Niki W. Waibel
|
|
Wojtek Walczak
|
|
Index: Python-3.3.5/Modules/_json.c
|
|
===================================================================
|
|
--- a/Modules/_json.c
|
|
+++ b/Modules/_json.c
|
|
@@ -975,7 +975,10 @@ scan_once_unicode(PyScannerObject *s, Py
|
|
kind = PyUnicode_KIND(pystr);
|
|
length = PyUnicode_GET_LENGTH(pystr);
|
|
|
|
- if (idx >= length) {
|
|
+ if (idx < 0)
|
|
+ /* Compatibility with Python version. */
|
|
+ idx += length;
|
|
+ if (idx < 0 || idx >= length) {
|
|
PyErr_SetNone(PyExc_StopIteration);
|
|
return NULL;
|
|
}
|