bug-gforth
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] arm: beagle: fix possible null dereferences


From: Geyslan G. Bem
Subject: [PATCH] arm: beagle: fix possible null dereferences
Date: Sun, 2 Aug 2020 18:28:04 -0300

Make assertions before pointer dereference.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
---
 arch/arm/beagle/circbuf.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/beagle/circbuf.c b/arch/arm/beagle/circbuf.c
index 05a4a43c..2ce84eb5 100644
--- a/arch/arm/beagle/circbuf.c
+++ b/arch/arm/beagle/circbuf.c
@@ -55,11 +55,13 @@ int buf_free (circbuf_t * buf)
 int buf_pop (circbuf_t * buf, char *dest, unsigned int len)
 {
        unsigned int i;
-       char *p = buf->top;
+       char *p;
 
        assert (buf != NULL);
        assert (dest != NULL);
 
+       p = buf->top;
+
        /* Cap to number of bytes in buffer */
        if (len > buf->size)
                len = buf->size;
@@ -83,11 +85,13 @@ int buf_push (circbuf_t * buf, const char *src, unsigned 
int len)
 {
        /* NOTE:  this function allows push to overwrite old data. */
        unsigned int i;
-       char *p = buf->tail;
+       char *p;
 
        assert (buf != NULL);
        assert (src != NULL);
 
+       p = buf->tail;
+
        for (i = 0; i < len; i++) {
                *p++ = src[i];
                if (p == buf->end) {
-- 
2.27.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]