rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

cups-dbus-utf.patch: no need to validate job-name name.

Browse Source
This commit is contained in:
Tim Waugh 2013-04-10 11:26:11 +01:00
parent 55c9869389
commit aee5018577
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cups-dbus-utf8.patch
View File

@ -104,12 +104,3 @@ diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
if (!dbus_message_iter_append_string(&iter, &val)) if (!dbus_message_iter_append_string(&iter, &val))
goto bail; goto bail;
} }
@@ -530,7 +605,7 @@ main(int argc, /* I - Number of comm
attr = ippFindAttribute(msg, "job-name", IPP_TAG_NAME);
if (attr)
{
- const char *val = ippGetString(attr, 0, NULL);
+ const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
if (!dbus_message_iter_append_string(&iter, &val))
goto bail;
}

5
cups.spec
View File

@ -621,6 +621,11 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Wed Apr 10 2013 Tim Waugh <twaugh@redhat.com>
- cups-dbus-utf.patch: now that the scheduler only accepts valid UTF-8
strings for job-name, there's no need to validate it as UTF-8 in the
dbus notifier.
* Thu Apr 4 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.1-4 * Thu Apr 4 2013 Tim Waugh <twaugh@redhat.com> 1:1.6.1-4
- Use IP address when resolving DNSSD URIs (bug #948288). - Use IP address when resolving DNSSD URIs (bug #948288).