aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2014-01-31 20:00:15 -0500
committerGene Cumm <gene.cumm@gmail.com>2014-01-31 20:00:15 -0500
commit240740abe6415bcdef92407e212419a59eec3674 (patch)
treeb01bb4edefa2efee3358e6af1ace8851c897d0cb
parent289212c713f90ecc6872e738483b9321025347ce (diff)
parent18d79b401ce15b29a5ee70cce928d231b1de032a (diff)
downloadsyslinux-240740abe6415bcdef92407e212419a59eec3674.tar.gz
syslinux-240740abe6415bcdef92407e212419a59eec3674.tar.xz
syslinux-240740abe6415bcdef92407e212419a59eec3674.zip
Merge remote-tracking branch 'erwan-github/hdt-memleak' into master
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
-rw-r--r--com32/gpllib/acpi/acpi.c1
-rw-r--r--com32/hdt/hdt-cli.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/com32/gpllib/acpi/acpi.c b/com32/gpllib/acpi/acpi.c
index d2bf29e5..3013f196 100644
--- a/com32/gpllib/acpi/acpi.c
+++ b/com32/gpllib/acpi/acpi.c
@@ -35,7 +35,6 @@
/* M1PS flags have to be interpreted as strings */
char *flags_to_string(char *buffer, uint16_t flags)
{
- memset(buffer, 0, sizeof(buffer));
strcpy(buffer, "default");
if ((flags & POLARITY_ACTIVE_HIGH) == POLARITY_ACTIVE_HIGH)
strcpy(buffer, "high");
diff --git a/com32/hdt/hdt-cli.c b/com32/hdt/hdt-cli.c
index 216b6bde..2895b13c 100644
--- a/com32/hdt/hdt-cli.c
+++ b/com32/hdt/hdt-cli.c
@@ -780,6 +780,8 @@ void start_auto_mode(struct s_hardware *hardware)
mypch = strtok(NULL, AUTO_SEPARATOR);
}
+ free(temp);
+
/* Executing found commands */
for (int i = 1; i <= nb_commands; i++) {
if (commands[i]) {