From 80a89bbd361262c3858c08d2b856faea7a95e878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Sat, 14 Nov 2015 07:18:34 -0300 Subject: [PATCH] (libretro-db) Get rid of calloc() in rmsgpack_read() --- libretro-db/rmsgpack.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libretro-db/rmsgpack.c b/libretro-db/rmsgpack.c index 88d82f945e..2e99453d1e 100644 --- a/libretro-db/rmsgpack.c +++ b/libretro-db/rmsgpack.c @@ -546,16 +546,17 @@ int rmsgpack_read(RFILE *fd, } else if (type < MPF_NIL) { + ssize_t read_len = 0; tmp_len = type - MPF_FIXSTR; - buff = (char *)calloc((size_t)(tmp_len + 1), sizeof(char)); + buff = (char *)malloc((size_t)(tmp_len + 1) * sizeof(char)); if (!buff) return -ENOMEM; - if (retro_fread(fd, buff, (ssize_t)tmp_len) == -1) + if ((read_len = retro_fread(fd, buff, (ssize_t)tmp_len)) == -1) { free(buff); goto error; } - buff[tmp_len] = '\0'; + buff[read_len] = '\0'; if (!callbacks->read_string) { free(buff);