[Cpufreqd-devel] sources2/src main.c,1.39,1.40

[Mattia D. <mat...@us...>]

Update of /cvsroot/cpufreqd/sources2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6309/src

Modified Files:
	main.c 
Log Message:
fixed memory leak when not able to set the requested profile

Index: main.c
===================================================================
RCS file: /cvsroot/cpufreqd/sources2/src/main.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- main.c	16 Sep 2005 17:03:43 -0000	1.39
+++ main.c	16 Sep 2005 17:49:30 -0000	1.40
@@ -157,6 +157,7 @@
 							i, new->policy.max, new->policy.min,
 							new->policy.governor, check->max, 
 							check->min, check->governor);
+					cpufreq_put_policy(check);
 					return -1;
 				} else {
 					clog(LOG_INFO, "Policy correctly set %d-%d-%s\n",
@@ -166,8 +167,10 @@
 						
 			}
 		}
-		else
+		else {
 			clog(LOG_WARNING, "Couldn't set profile \"%s\" set for cpu%d\n", new->name, i);
+			return -1;
+		}
 	}
 	/* profile postchange event */
 	if (new->directives.first) {
@@ -576,7 +579,7 @@
 		goto out_socket;
 	}
 
-	/* TODO: if we are going to pselect the socket
+	/* if we are going to pselect the socket
 	 * then block all signals to avoid races,
 	 * will be unblocked by pselect
 	 */
@@ -641,8 +644,8 @@
 					break;
 			}
 		}
-		/* if no socket available then pause()
-		 * otherwise continue and pselect the socket
+		/* paranoid check for timer expiration
+		 * (might actually happen...)
 		 */
 		else if (!timer_expired) {
 			pause();