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 /scheduler/log.c | |
parent | 37e7e6e0b27c7db3be8e160e87a63fec66e0fcca (diff) | |
download | cups-5a9febac19255ab8aea598449ea63bda730b2fe0.tar.gz |
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 'scheduler/log.c')
-rw-r--r-- | scheduler/log.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scheduler/log.c b/scheduler/log.c index 21603c883..a476d2a03 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -3,7 +3,7 @@ * * Log file routines for the CUPS scheduler. * - * Copyright 2007-2011 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -198,7 +198,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */ cupsFileClose(*lf); - strcpy(backname, filename); + strlcpy(backname, filename, sizeof(backname)); strlcat(backname, ".O", sizeof(backname)); unlink(backname); @@ -485,7 +485,7 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ if ((temp = malloc(sizeof(cupsd_joblog_t) + strlen(log_line))) != NULL) { temp->time = time(NULL); - strcpy(temp->message, log_line); + strlcpy(temp->message, log_line, sizeof(temp->message)); } if (!job->history) @@ -603,7 +603,7 @@ cupsdLogPage(cupsd_job_t *job, /* I - Job being printed */ if (!PageLogFormat) return (1); - strcpy(number, "1"); + strlcpy(number, "1", sizeof(number)); copies = 1; sscanf(page, "%255s%d", number, &copies); |