diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-29 09:16:26 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-03-29 09:16:26 +0200 |
| commit | f88db9b5fab274879fe1aeae1309dc7a23257040 (patch) | |
| tree | 5ed2b86e31b95a3feabc6642a31c9da0724ba5bf /python | |
| parent | 2820cf928b411a0227c07780dd2e74b9b0ebbd98 (diff) | |
| download | python-apt-f88db9b5fab274879fe1aeae1309dc7a23257040.tar.gz | |
PyFetchProgress::Pulse(): When ignoring a false return value from
PyArg_Parse() after running the simple callback pulse(), there can be
an exception on the stack, which must be cleared. (LP: #711225)
Diffstat (limited to 'python')
| -rw-r--r-- | python/progress.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/python/progress.cc b/python/progress.cc index 437309cf..5700a1b6 100644 --- a/python/progress.cc +++ b/python/progress.cc @@ -399,7 +399,9 @@ bool PyFetchProgress::Pulse(pkgAcquire * Owner) { // most of the time the user who subclasses the pulse() // method forgot to add a return {True,False} so we just - // assume he wants a True + // assume he wants a True. There may be a Python exception on the stack + // that must be cleared. + PyErr_Clear(); PyCbObj_BEGIN_ALLOW_THREADS return true; } |
