mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-06 07:15:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Protection around allocating malformed border buffers

Browse source
This commit is contained in:
Jack Zeal 2026-03-28 18:49:42 -07:00
parent d80dd2470b
commit 6148934dd7
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/common/borderset.c
View file

@ -4,9 +4,24 @@
#include "common/macros.h" #include "common/macros.h"
#include "buffer.h" #include "buffer.h"
struct borderset * getBorders(uint32_t id, int size, enum border_type type, int bevelSize) { struct borderset * getBorders(uint32_t id, int size, enum border_type type, int bevelSize) {
struct borderset * current = borderCache; struct borderset * current = borderCache;
struct borderset * last; struct borderset * last;
// Preventing building nonsense borders:
// If you try for a double bevel but it's so deep they would overlap, convert to a single bevel
if (type == BORDER_DOUBLE && (bevelSize > size/2)) {
type = BORDER_SINGLE;
}
// Anything with a size of 0 is converted to a 1-pixel flat border so as to prevent empty allocations
if (size < 1) {
type = BORDER_FLAT;
size = 1;
}
while (current != NULL) { while (current != NULL) {
if (current->size == size && current->id == id && current->type == type) { if (current->size == size && current->id == id && current->type == type) {
return current; return current;

2
src/ssd/ssd-border.c
View file

@ -54,7 +54,7 @@ ssd_border_create(struct ssd *ssd)
int bevelSize = theme->border_bevel_width; // TODO: configurable int bevelSize = theme->border_bevel_width;
/* From Pull request 3382 */ /* From Pull request 3382 */
float r = color[0]; float r = color[0];