diff options
| author | Andy Green <andy@warmcat.com> | 2024-05-12 05:42:30 +0100 |
|---|---|---|
| committer | Andy Green <andy@warmcat.com> | 2024-05-12 05:55:18 +0100 |
| commit | 1e0953ffb88bbf7701977fa08929230858b4b3d1 (patch) | |
| tree | d868757fdcf8453c3acfabcc0a4977b5ad63ac3f | |
| parent | bcde9a5b4964aba50f65253e0f1aaa967a6f9e34 (diff) | |
| download | libwebsockets-upstream-main.tar.gz | |
dlo-lhp: take care margin and padding atr may be NULLupstream-main
iwashiira on github https://github.com/warmcat/libwebsockets/issues/3140
found the html / css calculation could end up with NULL margin sizes.
| -rw-r--r-- | lib/misc/dlo/dlo-lhp.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/misc/dlo/dlo-lhp.c b/lib/misc/dlo/dlo-lhp.c index 151aacaf..d9857f46 100644 --- a/lib/misc/dlo/dlo-lhp.c +++ b/lib/misc/dlo/dlo-lhp.c @@ -219,8 +219,14 @@ lhp_set_dlo_padding_margin(lhp_pstack_t *ps, lws_dlo_t *dlo) int n; for (n = 0; n < 4; n ++) { - dlo->margin[n] = *lws_csp_px(ps->css_margin[n], ps); - dlo->padding[n] = *lws_csp_px(ps->css_padding[n], ps); + if (ps->css_margin[n]) + dlo->margin[n] = *lws_csp_px(ps->css_margin[n], ps); + else + lws_fx_set(dlo->margin[n], 0, 0); + if (ps->css_padding[n]) + dlo->padding[n] = *lws_csp_px(ps->css_padding[n], ps); + else + lws_fx_set(dlo->padding[n], 0, 0); } } |