[cups] Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
Tim Waugh
twaugh at fedoraproject.org
Tue Oct 30 17:10:14 UTC 2012
commit 611cccd2e11349e4d84cd94c05c5219e12aa0088
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Oct 30 16:49:20 2012 +0000
Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
Resolves: rhbz#863387
cups-dbus-utf8.patch | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++
cups.spec | 10 +++-
2 files changed, 117 insertions(+), 3 deletions(-)
---
diff --git a/cups-dbus-utf8.patch b/cups-dbus-utf8.patch
new file mode 100644
index 0000000..ba71fda
--- /dev/null
+++ b/cups-dbus-utf8.patch
@@ -0,0 +1,110 @@
+diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
+--- cups-1.6.1/notifier/dbus.c.dbus-utf8 2012-01-20 19:00:32.000000000 +0000
++++ cups-1.6.1/notifier/dbus.c 2012-10-30 17:03:40.260833091 +0000
+@@ -31,6 +31,8 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <assert.h>
++#include <wchar.h>
+
+ #ifdef HAVE_DBUS
+ # include <dbus/dbus.h>
+@@ -157,10 +159,78 @@ enum
+ * Local functions...
+ */
+
+-static int acquire_lock(int *fd, char *lockfile, size_t locksize);
++static int acquire_lock(int *fd, char *lockfile, size_t locksize);
++static const char *validate_utf8(const char *str);
+
+
+ /*
++ * 'validate_utf8()' - Convert to valid UTF-8
++ */
++
++static const char *
++validate_utf8 (const char *str)
++{
++ static char *buffer = NULL;
++ static size_t buflen = 0;
++ char *p;
++ size_t str_len;
++ unsigned int i;
++ mbstate_t instate, outstate;
++
++ if (str == NULL)
++ {
++ free (buffer);
++ return (NULL);
++ }
++
++ /* Is it already valid? */
++ if (mbstowcs (NULL, str, 0) != (size_t) -1)
++ return str;
++
++ /* Make sure our buffer is at least as large as the input string */
++ str_len = strlen (str);
++ if (str_len > buflen)
++ {
++ buflen = str_len + 1;
++ buffer = realloc (buffer, buflen);
++ }
++
++ memset (&instate, '\0', sizeof (mbstate_t));
++ memset (&outstate, '\0', sizeof (mbstate_t));
++ p = buffer;
++ i = 0;
++ while (i < str_len)
++ {
++ wchar_t wc;
++ size_t used, written;
++ mbstate_t orig_instate = instate;
++ used = mbrtowc (&wc, str + i, str_len - i, &instate);
++ switch (used)
++ {
++ case (size_t) -2:
++ case (size_t) -1:
++ wc = L'?'; /* so replacement is never longer than original char */
++ instate = orig_instate;
++ /* fallthru */
++ case 0:
++ used = 1;
++ }
++
++ written = wcrtomb (p, wc, &outstate);
++ if (written != -1)
++ {
++ p += written;
++ assert (p - buffer < buflen);
++ }
++
++ i += used;
++ }
++
++ *p = '\0';
++ return p;
++}
++
++/*
+ * 'main()' - Read events and send DBUS notifications.
+ */
+
+@@ -366,7 +436,7 @@ main(int argc, /* I - Number of comm
+ attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
+ 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;
+ }
+@@ -530,7 +600,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;
+ }
diff --git a/cups.spec b/cups.spec
index fcec01d..4a00fad 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,7 +10,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.6.1
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -28,7 +28,7 @@ Source11: macros.cups
Patch1: cups-no-gzip-man.patch
Patch2: cups-system-auth.patch
Patch3: cups-multilib.patch
-
+Patch4: cups-dbus-utf8.patch
Patch5: cups-banners.patch
Patch6: cups-serverbin-compat.patch
Patch7: cups-no-export-ssllibs.patch
@@ -194,7 +194,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch2 -p1 -b .system-auth
# Prevent multilib conflict in cups-config script.
%patch3 -p1 -b .multilib
-
+# Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
+%patch4 -p1 -b .dbus-utf8
# Ignore rpm save/new files in the banners directory.
%patch5 -p1 -b .banners
# Use compatibility fallback path for ServerBin.
@@ -576,6 +577,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man1/ipptool.1.gz
%changelog
+* Tue Oct 30 2012 Tim Waugh <twaugh at redhat.com> 1:1.6.1-8
+- Ensure attributes are valid UTF-8 in dbus notifier (bug #863387).
+
* Mon Oct 29 2012 Tim Waugh <twaugh at redhat.com> 1:1.6.1-7
- Removed broken cups-get-classes patch (bug #870612).
More information about the scm-commits
mailing list