From 9b14a3f853f2e16d657cdb30b5633fe5af28cf21 Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Tue, 14 Feb 2017 12:02:45 +0100
Subject: [PATCH] Hardware Monitor: Fixed several memory leaks when no hardware
 monitor sensor is found

---
 src/hwmon.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/hwmon.c b/src/hwmon.c
index 7827fc9d1..aab0751e7 100644
--- a/src/hwmon.c
+++ b/src/hwmon.c
@@ -105,6 +105,8 @@ static int hm_SYSFS_get_fan_speed_current (hashcat_ctx_t *hashcat_ctx, const int
   snprintf (path_cur, HCBUFSIZ_TINY - 1, "%s/pwm1",     syspath);
   snprintf (path_max, HCBUFSIZ_TINY - 1, "%s/pwm1_max", syspath);
 
+  hcfree (syspath);
+
   FILE *fd_cur = fopen (path_cur, "r");
 
   if (fd_cur == NULL)
@@ -162,8 +164,6 @@ static int hm_SYSFS_get_fan_speed_current (hashcat_ctx_t *hashcat_ctx, const int
 
   *val = (int) pwm1_percent;
 
-  hcfree (syspath);
-
   hcfree (path_cur);
   hcfree (path_max);
 
@@ -180,6 +180,8 @@ static int hm_SYSFS_set_fan_control (hashcat_ctx_t *hashcat_ctx, const int devic
 
   snprintf (path, HCBUFSIZ_TINY - 1, "%s/pwm1_enable", syspath);
 
+  hcfree (syspath);
+
   FILE *fd = fopen (path, "w");
 
   if (fd == NULL)
@@ -193,8 +195,6 @@ static int hm_SYSFS_set_fan_control (hashcat_ctx_t *hashcat_ctx, const int devic
 
   fclose (fd);
 
-  hcfree (syspath);
-
   hcfree (path);
 
   return 0;
@@ -212,6 +212,8 @@ static int hm_SYSFS_set_fan_speed_target (hashcat_ctx_t *hashcat_ctx, const int
   snprintf (path,     HCBUFSIZ_TINY - 1, "%s/pwm1",     syspath);
   snprintf (path_max, HCBUFSIZ_TINY - 1, "%s/pwm1_max", syspath);
 
+  hcfree (syspath);
+
   FILE *fd_max = fopen (path_max, "r");
 
   if (fd_max == NULL)
@@ -256,8 +258,6 @@ static int hm_SYSFS_set_fan_speed_target (hashcat_ctx_t *hashcat_ctx, const int
 
   fclose (fd);
 
-  hcfree (syspath);
-
   hcfree (path_max);
   hcfree (path);
 
@@ -274,6 +274,8 @@ static int hm_SYSFS_get_temperature_current (hashcat_ctx_t *hashcat_ctx, const i
 
   snprintf (path, HCBUFSIZ_TINY - 1, "%s/temp1_input", syspath);
 
+  hcfree (syspath);
+
   FILE *fd = fopen (path, "r");
 
   if (fd == NULL)
@@ -298,8 +300,6 @@ static int hm_SYSFS_get_temperature_current (hashcat_ctx_t *hashcat_ctx, const i
 
   *val = temperature / 1000;
 
-  hcfree (syspath);
-
   hcfree (path);
 
   return 0;
@@ -315,6 +315,8 @@ static int hm_SYSFS_get_pp_dpm_sclk (hashcat_ctx_t *hashcat_ctx, const int devic
 
   snprintf (path, HCBUFSIZ_TINY - 1, "%s/pp_dpm_sclk", syspath);
 
+  hcfree (syspath);
+
   FILE *fd = fopen (path, "r");
 
   if (fd == NULL)
@@ -351,8 +353,6 @@ static int hm_SYSFS_get_pp_dpm_sclk (hashcat_ctx_t *hashcat_ctx, const int devic
 
   *val = clockfreq;
 
-  hcfree (syspath);
-
   hcfree (path);
 
   return 0;
@@ -368,6 +368,8 @@ static int hm_SYSFS_get_pp_dpm_mclk (hashcat_ctx_t *hashcat_ctx, const int devic
 
   snprintf (path, HCBUFSIZ_TINY - 1, "%s/pp_dpm_mclk", syspath);
 
+  hcfree (syspath);
+
   FILE *fd = fopen (path, "r");
 
   if (fd == NULL)
@@ -404,8 +406,6 @@ static int hm_SYSFS_get_pp_dpm_mclk (hashcat_ctx_t *hashcat_ctx, const int devic
 
   *val = clockfreq;
 
-  hcfree (syspath);
-
   hcfree (path);
 
   return 0;
@@ -421,6 +421,8 @@ static int hm_SYSFS_get_pp_dpm_pcie (hashcat_ctx_t *hashcat_ctx, const int devic
 
   snprintf (path, HCBUFSIZ_TINY - 1, "%s/pp_dpm_pcie", syspath);
 
+  hcfree (syspath);
+
   FILE *fd = fopen (path, "r");
 
   if (fd == NULL)
@@ -458,8 +460,6 @@ static int hm_SYSFS_get_pp_dpm_pcie (hashcat_ctx_t *hashcat_ctx, const int devic
 
   *val = lanes;
 
-  hcfree (syspath);
-
   hcfree (path);
 
   return 0;
@@ -475,6 +475,8 @@ static int hm_SYSFS_set_power_dpm_force_performance_level (hashcat_ctx_t *hashca
 
   snprintf (path, HCBUFSIZ_TINY - 1, "%s/power_dpm_force_performance_level", syspath);
 
+  hcfree (syspath);
+
   FILE *fd = fopen (path, "w");
 
   if (fd == NULL)
@@ -488,8 +490,6 @@ static int hm_SYSFS_set_power_dpm_force_performance_level (hashcat_ctx_t *hashca
 
   fclose (fd);
 
-  hcfree (syspath);
-
   hcfree (path);
 
   return 0;