diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-10-01 03:01:10 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-10-01 03:01:10 +0000 |
| commit | 5a9febac19255ab8aea598449ea63bda730b2fe0 (patch) | |
| tree | 1ca7eead0982e5b8893cadd8b2215d1ea96171f7 /notifier | |
| parent | 37e7e6e0b27c7db3be8e160e87a63fec66e0fcca (diff) | |
Merge changes from CUPS 1.7svn-r10629.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3933 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'notifier')
| -rw-r--r-- | notifier/dbus.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/notifier/dbus.c b/notifier/dbus.c index 890b2ae09..1629c4e7f 100644 --- a/notifier/dbus.c +++ b/notifier/dbus.c @@ -3,7 +3,7 @@ * * D-Bus notifier for CUPS. * - * Copyright 2008-2011 by Apple Inc. + * Copyright 2008-2012 by Apple Inc. * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2007 Tim Waugh <twaugh@redhat.com> * Copyright 1997-2005 by Easy Software Products. @@ -445,7 +445,8 @@ main(int argc, /* I - Number of command-line args */ if (i) *p++ = ','; - strcpy(p, ippGetString(attr, i, NULL)); + strlcpy(p, ippGetString(attr, i, NULL), + reasons_length - (p - printer_reasons)); p += strlen(p); } if (!dbus_message_iter_append_string(&iter, &printer_reasons)) @@ -517,7 +518,8 @@ main(int argc, /* I - Number of command-line args */ if (i) *p++ = ','; - strcpy(p, ippGetString(attr, i, NULL)); + strlcpy(p, ippGetString(attr, i, NULL), + reasons_length - (p - job_reasons)); p += strlen(p); } if (!dbus_message_iter_append_string(&iter, &job_reasons)) |