From e2f130542be12a22c62744e718f0a5f884fc89d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Thu, 22 Dec 2016 12:32:33 +0100 Subject: text: change datatype of Mark to uintptr_t This should avoid undefined pointer comparisons. --- text.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'text.c') diff --git a/text.c b/text.c index 1e97a14..ace6b2d 100644 --- a/text.c +++ b/text.c @@ -1634,8 +1634,8 @@ Mark text_mark_set(Text *txt, size_t pos) { return (Mark)&txt->end; Location loc = piece_get_extern(txt, pos); if (!loc.piece) - return NULL; - return loc.piece->data + loc.off; + return (Mark)NULL; + return (Mark)(loc.piece->data + loc.off); } size_t text_mark_get(Text *txt, Mark mark) { @@ -1649,8 +1649,10 @@ size_t text_mark_get(Text *txt, Mark mark) { return txt->size; for (Piece *p = txt->begin.next; p->next; p = p->next) { - if (p->data <= mark && mark < p->data + p->len) - return cur + (mark - p->data); + Mark start = (Mark)(p->data); + Mark end = start + p->len; + if (start <= mark && mark < end) + return cur + (mark - start); cur += p->len; } -- cgit v1.2.3