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

mitsu_m1: We weren't allocating sufficient memory for "raw" prints

Browse source
This commit is contained in:
Solomon Peachy 2021-07-12 20:24:05 -04:00
parent 9871160a45
commit bd5e58205b
1 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
backend_mitsud90.c
View file

@ -847,18 +847,6 @@ static int mitsud90_read_parse(void *vctx, const void **vjob, int data_fd, int c
hptr += i;
}
/* Allocate ourselves a payload buffer */
job->datalen = 0;
job->databuf = malloc(sizeof(struct mitsud90_plane_hdr) + 1024 +
be16_to_cpu(job->hdr.cols) * be16_to_cpu(job->hdr.rows) * 3);
if (!job->databuf) {
ERROR("Memory allocation failure!\n");
mitsud90_cleanup_job(job);
return CUPS_BACKEND_RETRY_CURRENT;
}
job->datalen = 0;
/* Sanity check header */
if (job->hdr.hdr[0] != 0x1b ||
job->hdr.hdr[1] != 0x53 ||
@ -871,6 +859,20 @@ static int mitsud90_read_parse(void *vctx, const void **vjob, int data_fd, int c
return CUPS_BACKEND_CANCEL;
}
/* Initial parsing */
if (ctx->conn->type == P_MITSU_M1 ||
ctx->conn->type == P_FUJI_ASK500) {
/* See if it's a special gutenprint "not-raw" job */
job->is_raw = !job->hdr.zero_b[3];
job->hdr.zero_b[3] = 0;
} else {
if (job->hdr.zero_b[3] && job->hdr.pano.on == 0x03) {
job->is_pano = 1;
job->hdr.zero_b[3] = 0;
job->hdr.pano.on = 0x01;
}
}
/* Sanity check panorama parameters */
if (job->hdr.pano.on &&
ctx->conn->type == P_MITSU_D90) {
@ -920,29 +922,21 @@ static int mitsud90_read_parse(void *vctx, const void **vjob, int data_fd, int c
}
}
/* How many pixels do we need to read? */
remain = be16_to_cpu(job->hdr.cols) * be16_to_cpu(job->hdr.rows) * 3;
if (ctx->conn->type == P_MITSU_M1 ||
ctx->conn->type == P_FUJI_ASK500) {
/* See if it's a special gutenprint "not-raw" job */
job->is_raw = !job->hdr.zero_b[3];
job->hdr.zero_b[3] = 0;
/* If it's a raw M1 job, the pixels are 2 bytes each */
if (job->is_raw)
remain *= 2;
} else {
if (job->hdr.zero_b[3] && job->hdr.pano.on == 0x03) {
job->is_pano = 1;
job->hdr.zero_b[3] = 0;
job->hdr.pano.on = 0x01;
}
}
if (job->is_raw)
remain *= 2;
/* Add in the plane header */
remain += sizeof(struct mitsud90_plane_hdr);
/* Allocate ourselves a payload buffer */
job->databuf = malloc(remain + 1024);
if (!job->databuf) {
ERROR("Memory allocation failure!\n");
mitsud90_cleanup_job(job);
return CUPS_BACKEND_RETRY_CURRENT;
}
job->datalen = 0;
/* Now read in the rest */
while(remain) {
i = read(data_fd, job->databuf + job->datalen, remain);