improve logging when something goes wrong (and one memory leak as bonus)

yast · Oct 14, 2013 · 3e89600 · 3e89600
1 parent 69090ee
commit 3e89600
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/wfm/src/Y2WFMComponent.cc b/wfm/src/Y2WFMComponent.cc
@@ -121,6 +121,8 @@ bool Y2WFMComponent::createDefaultSCR ()
     WFMSubAgent* scr = new WFMSubAgent ("scr", 0);
 
     if (!scr->start ()) {
+        y2internal("Failed to start default SCR");
+        delete scr;
 	return false;
     }
 
@@ -338,7 +340,10 @@ Y2WFMComponent::SCRGetName (const YCPInteger &h)
 
     int handle = h->value ();
     WFMSubAgents::iterator it = find_handle (handle);
-    return YCPString (it != scrs.end () ? (*it)->get_name () : "");
+    bool handle_found = it != scrs.end ();
+    if (!handle_found)
+        ycpinternal("SCRGetName for not existing handle %i", handle);
+    return YCPString ( handle_found ? (*it)->get_name () : "");
 }