Attachment #209335 for bug #290470

View | Details | Raw Unified | Return to bug 290470
Collapse All | Expand All

Lines 2322-2328 Link Here

(-)koffice-1.6.3.orig/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc (-1 / +1 lines)
2322	width, -height, height);	2322	width, -height, height);
2323		2323
2324	// allocate a line buffer	2324	// allocate a line buffer
2325	lineBuf = (Guchar )gmalloc(4 width);	2325	lineBuf = (Guchar *)gmallocn(width, 4);
2326		2326
2327	// set up to process the data stream	2327	// set up to process the data stream
2328	imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),	2328	imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(),

Lines 327-333 Link Here

(-)koffice-1.6.3.orig/filters/kword/pdf/xpdf/xpdf/Stream.cc (-1 / +5 lines)
327	} else {	327	} else {
328	imgLineSize = nVals;	328	imgLineSize = nVals;
329	}	329	}
330	imgLine = (Guchar )gmalloc(imgLineSize sizeof(Guchar));	330	if (width > INT_MAX / nComps) {
		331	// force a call to gmallocn(-1,...), which will throw an exception
		332	imgLineSize = -1;
		333	}
		334	imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
331	imgIdx = nVals;	335	imgIdx = nVals;
332	}	336	}
333		337

Return to bug 290470