slp/selphy_print
1
0
Fork 0
Code Issues 48 Pull requests Activity

DNP: Work around a bizzare short read scenario in the job footer

Browse source
This commit is contained in:
Solomon Peachy 2020-01-21 20:29:11 -05:00
parent 288f06a634
commit 86907925fc
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
backend_dnpds40.c
View file

@ -1333,12 +1333,21 @@ static int dnpds40_read_parse(void *vctx, const void **vjob, int data_fd, int co
if (i < 0) {
dnpds40_cleanup_job(job);
return i;
}
if (i == 0)
} else if (i == 0) {
break;
if (i < (int) sizeof(struct dnpds40_cmd)) {
dnpds40_cleanup_job(job);
return CUPS_BACKEND_CANCEL;
} else if (i < (int) sizeof(struct dnpds40_cmd)) {
int r = i;
i = read(data_fd, job->databuf + job->datalen + r, sizeof(struct dnpds40_cmd) - r);
if (i < 0) {
dnpds40_cleanup_job(job);
return i;
} else if (i == 0) {
break;
} else if (i < (int)(sizeof(struct dnpds40_cmd) - r)) {
ERROR("Double short read (%d + %d vs %d)\n", r, i, (int)sizeof(struct dnpds40_cmd));
dnpds40_cleanup_job(job);
return CUPS_BACKEND_CANCEL;
}
}
/* Special case handling for beginning of job */
@ -3212,7 +3221,7 @@ static const char *dnpds40_prefixes[] = {
/* Exported */
struct dyesub_backend dnpds40_backend = {
.name = "DNP DS-series / Citizen C-series",
.version = "0.126",
.version = "0.127",
.uri_prefixes = dnpds40_prefixes,
.flags = BACKEND_FLAG_JOBLIST,
.cmdline_usage = dnpds40_cmdline,