sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Ensure we don't do lp_servicename()'s in tdb traverse as this

Browse Source 
allocates lots of memory.
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 230941d2fb
commit fbc8c6a109
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/printing/printing.c
View File

@ -115,10 +115,12 @@ store a job structure back to the database
static BOOL print_job_store(int jobid, struct printjob *pjob) static BOOL print_job_store(int jobid, struct printjob *pjob)
{ {
TDB_DATA d; TDB_DATA d;
BOOL ret;
d.dptr = (void *)pjob; d.dptr = (void *)pjob;
d.dsize = sizeof(*pjob); d.dsize = sizeof(*pjob);
ret = (tdb_store(tdb, print_key(jobid), d, TDB_REPLACE) == 0);
return (tdb_store(tdb, print_key(jobid), d, TDB_REPLACE) == 0); return ret;
} }
/**************************************************************************** /****************************************************************************
@ -185,7 +187,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void
memcpy(&jobid, key.dptr, sizeof(jobid)); memcpy(&jobid, key.dptr, sizeof(jobid));
memcpy(&pjob, data.dptr, sizeof(pjob)); memcpy(&pjob, data.dptr, sizeof(pjob));
if (!strequal(lp_servicename(ts->snum), pjob.queuename)) { if (ts->snum != lp_servicenumber(pjob.queuename)) {
/* this isn't for the queue we are looking at */ /* this isn't for the queue we are looking at */
ts->total_jobs++; ts->total_jobs++;
return 0; return 0;
@ -1176,7 +1178,7 @@ static int traverse_fn_queue(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *
memcpy(&pjob, data.dptr, sizeof(pjob)); memcpy(&pjob, data.dptr, sizeof(pjob));
/* maybe it isn't for this queue */ /* maybe it isn't for this queue */
if (!strequal(lp_servicename(ts->snum), pjob.queuename)) if (ts->snum != lp_servicenumber(pjob.queuename))
return 0; return 0;
if (ts->qcount >= ts->maxcount) return 0; if (ts->qcount >= ts->maxcount) return 0;
@ -1213,7 +1215,7 @@ static int traverse_count_fn_queue(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data,
memcpy(&pjob, data.dptr, sizeof(pjob)); memcpy(&pjob, data.dptr, sizeof(pjob));
/* maybe it isn't for this queue */ /* maybe it isn't for this queue */
if (!strequal(lp_servicename(ts->snum), pjob.queuename)) if (ts->snum != lp_servicenumber(pjob.queuename))
return 0; return 0;
ts->count++; ts->count++;