Skip to content

fix(koptreflow): margin calculation, memory leaks, and div-by-zero #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tachibana-shin wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix(koptreflow): margin calculation, memory leaks, and div-by-zero #68

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
267936f
koptreflow: fix copy-paste error in bottom margin calculation
tachibana-shin Jul 22, 2026
d0f576f
koptreflow: free BOXA/NUMA before overwriting
tachibana-shin Jul 22, 2026
4249822
koptreflow: clear wrectmaps before rebuilding
tachibana-shin Jul 22, 2026
9b25223
koptreflow: guard division by zero in rectmaps loop
tachibana-shin Jul 22, 2026
a27e263
koptreflow: add input validation in pixmap_to_bmp()
tachibana-shin Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions lib/koptreflow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ void pixmap_to_bmp(WILLUSBITMAP *bmp, unsigned char *pix_data, int ncomp) {
int i,j;
unsigned char *b, *p;

if (!pix_data || bmp->width <= 0 || bmp->height <= 0)
return;
if (ncomp == 2) {
bmp->bpp = 8;
bmp_alloc(bmp);
Expand Down Expand Up @@ -105,7 +107,7 @@ void k2pdfopt_reflow_bmp(KOPTContext *kctx) {
/* copy master bitmap to context dst bitmap */
dst = &kctx->dst;
martop = (int) (k2settings->dst_dpi * k2settings->dstmargins.box[1] * 2 + .5);
marbot = (int) (k2settings->dst_dpi * k2settings->dstmargins.box[1] * 2 + .5);
marbot = (int) (k2settings->dst_dpi * k2settings->dstmargins.box[3] * 2 + .5);
marleft = (int) (k2settings->dst_dpi * k2settings->dstmargins.box[0] + .5);
dst->bpp = masterinfo->bmp.bpp;
dst->width = masterinfo->bmp.width;
Expand All @@ -123,6 +125,13 @@ void k2pdfopt_reflow_bmp(KOPTContext *kctx) {
kctx->page_height = kctx->dst.height;
kctx->precache = 0;

/* Free previous word box data before overwriting */
boxaDestroy(&kctx->rboxa);
boxaDestroy(&kctx->nboxa);
numaDestroy(&kctx->rnai);
numaDestroy(&kctx->nnai);
wrectmaps_clear(&kctx->rectmaps);

int j;
BOXA *rboxa = boxaCreate(masterinfo->rectmaps.n);
BOXA *nboxa = boxaCreate(masterinfo->rectmaps.n);
Expand All @@ -134,12 +143,16 @@ void k2pdfopt_reflow_bmp(KOPTContext *kctx) {
rectmap->coords[1].y,
rectmap->coords[2].x,
rectmap->coords[2].y);
BOX* nlbox = boxCreate(rectmap->coords[0].x*k2settings->src_dpi/rectmap->srcdpiw/kctx->zoom + kctx->bbox.x0,
BOX* nlbox = NULL;
if (rectmap->srcdpiw > 0. && rectmap->srcdpih > 0. && kctx->zoom > 0.) {
nlbox = boxCreate(rectmap->coords[0].x*k2settings->src_dpi/rectmap->srcdpiw/kctx->zoom + kctx->bbox.x0,
rectmap->coords[0].y*k2settings->src_dpi/rectmap->srcdpih/kctx->zoom + kctx->bbox.y0,
rectmap->coords[2].x*k2settings->src_dpi/rectmap->srcdpiw/kctx->zoom,
rectmap->coords[2].y*k2settings->src_dpi/rectmap->srcdpih/kctx->zoom);
}
boxaAddBox(rboxa, rlbox, L_INSERT);
boxaAddBox(nboxa, nlbox, L_INSERT);
if (nlbox != NULL)
boxaAddBox(nboxa, nlbox, L_INSERT);
wrectmaps_add_wrectmap(&kctx->rectmaps, rectmap);

/*printf("rectmap:coords:\t%.1f %.1f\t%.1f %.1f\t%.1f %.1f\t%.1f %.1f\n",
Expand Down