From bfe64789b602ce7524053588cb778afbe6d98718 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 25 Oct 2016 16:59:53 -0600 Subject: [PATCH] lcm1602: fix potential reference of uninitialized memory Signed-off-by: Jon Trulson --- src/lcm1602/lcm1602.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lcm1602/lcm1602.c b/src/lcm1602/lcm1602.c index 6bb1ceef..d917206b 100644 --- a/src/lcm1602/lcm1602.c +++ b/src/lcm1602/lcm1602.c @@ -55,6 +55,8 @@ lcm1602_context lcm1602_i2c_init(int bus, int address, bool is_expander, if (!dev) return NULL; + memset((void *)dev, 0, sizeof(struct _lcm1602_context)); + // make sure MRAA is initialized int mraa_rv; if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) @@ -64,8 +66,6 @@ lcm1602_context lcm1602_i2c_init(int bus, int address, bool is_expander, return NULL; } - memset((void *)dev, 0, sizeof(struct _lcm1602_context)); - // initialize the MRAA context if (!(dev->i2c = mraa_i2c_init(bus))) @@ -146,6 +146,8 @@ lcm1602_context lcm1602_gpio_init(uint8_t rs, uint8_t enable, if (!dev) return NULL; + memset((void *)dev, 0, sizeof(struct _lcm1602_context)); + // make sure MRAA is initialized int mraa_rv; if ((mraa_rv = mraa_init()) != MRAA_SUCCESS) @@ -155,8 +157,6 @@ lcm1602_context lcm1602_gpio_init(uint8_t rs, uint8_t enable, return NULL; } - memset((void *)dev, 0, sizeof(struct _lcm1602_context)); - // initialize the MRAA contexts if (!(dev->gpioRS = mraa_gpio_init(rs)))