← Back to branch summary

~ubuntu-branches/ubuntu/karmic/python2.6/karmic-proposed

« back to all changes in this revision

Viewing changes to Python/marshal.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2009-10-09 23:07:54 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20091009230754-0ccehibkqf9a6wmv
Tags: 2.6.4~rc1-0ubuntu1
https://launchpad.net/bugs/445530
https://launchpad.net/bugs/447370
* Python 2.6.4 release candidate 1.
  - Issue #7068: Fixed the partial renaming that occured in r72594.
  - Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6.
* Remove the conflict with python-setuptools (fixed in issue #7068).
* Build _hashlib as a builtin. LP: #445530.
* python2.6-doc: Don't compress the sphinx inventory.
* python2.6-doc: Fix jquery.js symlink. LP: #447370.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Python/marshal.c
589
589
                        ob->ob_size = n;
590
590
                        for (i = 0; i < size; i++) {
591
591
                                int digit = r_short(p);
592
 
                                if (digit < 0) {
 
592
                                if (digit < 0 ||
 
593
                                    (digit == 0 && i == size-1)) {
593
594
                                        Py_DECREF(ob);
594
595
                                        PyErr_SetString(PyExc_ValueError,
595
596
                                                        "bad marshal data");