From c6a236cfef3585ec877d7e763f62f729f6dd1f3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 13 Nov 2013 19:40:15 +0100 Subject: [PATCH] - fix job history logging (patch from upstream, via fedora) --- cups-jobhistory.patch | 20 ++++++++++++++++++++ cups.spec | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 cups-jobhistory.patch diff --git a/cups-jobhistory.patch b/cups-jobhistory.patch new file mode 100644 index 0000000..391120d --- /dev/null +++ b/cups-jobhistory.patch @@ -0,0 +1,20 @@ +diff -up cups-1.7.0/scheduler/log.c.jobhistory cups-1.7.0/scheduler/log.c +--- cups-1.7.0/scheduler/log.c.jobhistory 2013-10-28 16:30:39.852015304 +0000 ++++ cups-1.7.0/scheduler/log.c 2013-10-28 16:30:48.502057711 +0000 +@@ -525,12 +525,13 @@ cupsdLogJob(cupsd_job_t *job, /* I - Jo + */ + + cupsd_joblog_t *temp; /* Copy of log message */ ++ size_t log_len = strlen(log_line); ++ /* Length of log message */ + +- +- if ((temp = malloc(sizeof(cupsd_joblog_t) + strlen(log_line))) != NULL) ++ if ((temp = malloc(sizeof(cupsd_joblog_t) + log_len)) != NULL) + { + temp->time = time(NULL); +- strlcpy(temp->message, log_line, sizeof(temp->message)); ++ memcpy(temp->message, log_line, log_len + 1); + } + + if (!job->history) diff --git a/cups.spec b/cups.spec index 97b1328..bc63553 100644 --- a/cups.spec +++ b/cups.spec @@ -46,6 +46,7 @@ Patch15: reactivate_recommended_driver.patch Patch16: read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch Patch17: %{name}-use-ipp1.1.patch Patch18: %{name}-final-content-type.patch +Patch19: %{name}-jobhistory.patch # avahi patches from fedora Patch100: %{name}-avahi-address.patch Patch101: %{name}-avahi-no-threaded.patch @@ -268,6 +269,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS. %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 %if %{with avahi} %patch100 -p1 -- 2.44.0