This commit is contained in:
Kalev Lember 2013-04-15 22:04:53 +02:00
parent 2655f4b74c
commit 4b8602fcc8
3 changed files with 6 additions and 42 deletions

View File

@ -1,32 +0,0 @@
From c1fb6516031d3c32abd640f09a4814ae4363f979 Mon Sep 17 00:00:00 2001
From: Simon Feltman <sfeltman@src.gnome.org>
Date: Sun, 31 Mar 2013 08:32:34 +0000
Subject: Fix stack corruption due to incorrect format for argument parser
Fix call to PyArg_ParseTupleAndKeywords that used a format parser
of "l" meaning long (8 bytes) in combination with an output pointer
of guint (4 bytes). Change to use gulong with a format of "k".
https://bugzilla.gnome.org/show_bug.cgi?id=696892
---
diff --git a/gi/_gobject/pygflags.c b/gi/_gobject/pygflags.c
index 83aa4dc..bdeaae7 100644
--- a/gi/_gobject/pygflags.c
+++ b/gi/_gobject/pygflags.c
@@ -129,12 +129,12 @@ static PyObject *
pyg_flags_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
{
static char *kwlist[] = { "value", NULL };
- guint value;
+ gulong value;
PyObject *pytc, *values, *ret, *pyint;
GType gtype;
GFlagsClass *eclass;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "l", kwlist, &value))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "k", kwlist, &value))
return NULL;
pytc = PyObject_GetAttrString((PyObject *)type, "__gtype__");
--
cgit v0.9.1

View File

@ -21,8 +21,8 @@
### Abstract ###
Name: pygobject3
Version: 3.8.0
Release: 2%{?dist}
Version: 3.8.1
Release: 1%{?dist}
License: LGPLv2+ and MIT
Group: Development/Languages
Summary: Python 2 bindings for GObject Introspection
@ -69,12 +69,6 @@ Patch2: pygobject-3.3.4-known-failures.patch
# Not yet sent upstream:
Patch3: test-list-marshalling.patch
# Cherrypick of enum-handling bug, needed to stop the test suite
# bombing out the Python interpreter on ppc64 (see rhbz#924425)
# This was:
# https://git.gnome.org/browse/pygobject/commit/?h=pygobject-3-8&id=c1fb6516031d3c32abd6
Patch4: c1fb6516031d3c32abd640f09a4814ae4363f979.patch
# Disable a test that still fails on ppc64 (see
# https://bugzilla.redhat.com/show_bug.cgi?id=924425#c7 )
# Filed upstream as:
@ -162,7 +156,6 @@ for use in Python 3 programs.
%patch1 -p1 -b .ignore-more-pep8-errors
%patch2 -p1 -b .known-failures
%patch3 -p1 -b .test-list-marshalling
%patch4 -p1 -b .c1fb6516031d3c32abd640f09a4814ae4363f979
%patch5 -p1
%if 0%{?with_python3}
@ -275,6 +268,9 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity}
%endif # with_python3
%changelog
* Mon Apr 15 2013 Kalev Lember <kalevlember@gmail.com> - 3.8.1-1
- Update to 3.8.1
* Tue Apr 2 2013 David Malcolm <dmalcolm@redhat.com> - 3.8.0-2
- add workarounds for ppc64 (rhbz#924425)

View File

@ -1 +1 @@
5a1dc34c787b4320da032e87412caca4 pygobject-3.8.0.tar.xz
88265ec145e31a50b66386fcdeb91ce6 pygobject-3.8.1.tar.xz