Merge pull request #2972 from sebastiankuttnig/memleak

drivers/main.c, drivers/dummy-ups.c: fix memory issues

Author: jimklimov

drivers/dummy-ups.c

@@ -564,22 +564,26 @@ void upsdrv_initups(void)
 
 void upsdrv_cleanup(void)
 {
-	if ( (mode == MODE_META) || (mode == MODE_REPEATER) )
-	{
-		if (ups)
-		{
-			upscli_disconnect(ups);
-		}
-
-		if (ctx)
-		{
-			pconf_finish(ctx);
-			free(ctx);
-		}
+	if (ups) {
+		upscli_disconnect(ups);
+		free(ups);
+		ups = NULL;
+	}
 
+	if (client_upsname) {
 		free(client_upsname);
+		client_upsname = NULL;
+	}
+
+	if (hostname) {
 		free(hostname);
-		free(ups);
+		hostname = NULL;
+	}
+
+	if (ctx) {
+		pconf_finish(ctx);
+		free(ctx);
+		ctx = NULL;
 	}
 }
 

drivers/main.c

@@ -1792,11 +1792,16 @@ static void splitxarg(char *inbuf)
 	}
 
 	/* see if main handles this first */
-	if (main_arg(buf, val))
+	if (main_arg(buf, val)) {
+		free(buf);
+
 		return;
+	}
 
 	/* otherwise store it for later */
 	storeval(buf, val);
+
+	free(buf);
 }
 
 /* dump the list from the vartable for external parsers */