rpms/hplip
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Prevent hpaio segfaulting on invalid URIs (bug #649092).

Browse Source
This commit is contained in:
Tim Waugh 2010-12-13 16:54:46 +00:00
parent 3e7f8d1653
commit 7ba5478f32
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hplip-hpaio-segfault.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up hplip-3.10.9/io/hpmud/hpmud.c.hpaio-segfault hplip-3.10.9/io/hpmud/hpmud.c
--- hplip-3.10.9/io/hpmud/hpmud.c.hpaio-segfault 2010-12-13 16:53:16.470306314 +0000
+++ hplip-3.10.9/io/hpmud/hpmud.c 2010-12-13 16:53:17.423332321 +0000
@@ -305,6 +305,7 @@ static int new_device(const char *uri, e
{
BUG("invalid uri %s\n", uri);
*result = HPMUD_R_INVALID_URI;
+ index = 0;
goto bugout;
}
msp->device[i].io_mode = mode;

5
hplip.spec
View File

@ -44,6 +44,7 @@ Patch27: hplip-emit-SIGNAL.patch
Patch28: hplip-fab-root-crash.patch
Patch29: hplip-addprinter.patch
Patch30: hplip-dbus-exception.patch
Patch31: hplip-hpaio-segfault.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -276,6 +277,9 @@ done
# Catch D-Bus exceptions in fax dialog (bug #645316).
%patch30 -p1 -b .dbus-exception
# Prevent hpaio segfaulting on invalid URIs (bug #649092).
%patch31 -p1 -b .hpaio-segfault
sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
@ -503,6 +507,7 @@ fi
%changelog
* Mon Dec 13 2010 Tim Waugh <twaugh@redhat.com> - 3.10.9-9
- Prevent hpaio segfaulting on invalid URIs (bug #649092).
- Catch D-Bus exceptions in fax dialog (bug #645316).
* Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-8