diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-10-28 15:35:44 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2013-10-28 15:35:44 +0000 |
| commit | ff2b08f99c9a4810a95365be000f97f6e06d61c2 (patch) | |
| tree | 87a8e0596d2bc55e546cd9545585abe7d72eda4c /scheduler/log.c | |
| parent | d22632216241cc6e49665449b1a0d906668ea252 (diff) | |
| download | cups-ff2b08f99c9a4810a95365be000f97f6e06d61c2.tar.gz | |
Fix <rdar://problem/15331639> cups.org: Regression in auto-debug logging
Need to use memcpy instead of strlcpy or strcpy.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11366 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/log.c')
| -rw-r--r-- | scheduler/log.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scheduler/log.c b/scheduler/log.c index 3bea18a27..e72e4431b 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -541,12 +541,13 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ */ 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) |