[Gpredict-svn] SF.net SVN: gpredict:[649] trunk

[<cs...@us...>]

Revision: 649
          http://gpredict.svn.sourceforge.net/gpredict/?rev=649&view=rev
Author:   csete
Date:     2010-09-04 11:06:39 +0000 (Sat, 04 Sep 2010)

Log Message:
-----------
Applied patch 3059022 from Charles Suprin AA1VS fixing crash if module file is empty on empty (bugs 3057771 and 3058753).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/src/gtk-sat-module.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-08-21 08:50:48 UTC (rev 648)
+++ trunk/ChangeLog	2010-09-04 11:06:39 UTC (rev 649)
@@ -1,5 +1,12 @@
 2010-08-21 Alexandru Csete <oz9aec at gmail.com>
 
+    * src/gtk-sat-module.c:
+    Applied patch 3059022 from Charles Suprin AA1VS fixing crash if module file
+    is empty on empty (bugs 3057771 and 3058753).
+
+
+2010-08-21 Alexandru Csete <oz9aec at gmail.com>
+
     * src/gtk-sat-selector.c:
     Applied patch 3050047 from Patrick Strasser OE6PSE to improve searching
     in the satellite selector.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2010-08-21 08:50:48 UTC (rev 648)
+++ trunk/NEWS	2010-09-04 11:06:39 UTC (rev 649)
@@ -18,6 +18,7 @@
 - Fixed bug 2674626: Process 100% CPU load with one kepler element.
 - Fixed bug 2792349: Segfault on certain satellites (Geo).
 - Fixed bug 3050068: Unable to update TLE from local files.
+- Fixed bugs 3057771 and 3058753: Crash if module file is empty.
 - Applied patch 2876485: Fix a memory leak in the rotator controller (Thanks to Charles Suprin AA1VS).
 - Applied patch 2877878: Change Flag to Lock in tle-update (thanks to Charles Suprin AA1VS).
 - Applied patch 2877918: Fixes segfault in TLE updater (thanks to Charles Suprin AA1VS).
@@ -41,6 +42,7 @@
 - Applied patch 3009725: Delete Explicit Call to gtk_set_locale (Thanks to Charles Suprin AA1VS).
 - Applied patch 3009727: Free satellite hash references (Thanks to Charles Suprin AA1VS).
 - Applied patch 3050047: Improve sat search and prediction of upcoming passes (Thanks to Patrick Strasser OE6PSE)
+- Applied patch 3059022: Fix gpredict crashed with NULL pointer exception (Thanks to Charles Suprin AA1VS).
 - Slightly improved UI for the single-satellite view.
 - Command line options for cleaning user's TLE and transponder data, see --help for list.
 - Satellite Map: Added shadow to satellite marker and label to enhance visual appearance

Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c	2010-08-21 08:50:48 UTC (rev 648)
+++ trunk/src/gtk-sat-module.c	2010-09-04 11:06:39 UTC (rev 649)
@@ -270,6 +270,15 @@
     /* load configuration; note that this will also set the module name */
     gtk_sat_module_read_cfg_data (GTK_SAT_MODULE (widget), cfgfile);
 
+	/*check that we loaded some reasonable data*/
+	if (GTK_SAT_MODULE(widget)->cfgdata==NULL){
+		sat_log_log (SAT_LOG_LEVEL_ERROR,
+                     _("%s: Module %s has problems."),
+                     __FUNCTION__, cfgfile);
+		
+        return NULL;
+	}
+	
     /* module state */
     if ((g_key_file_has_key (GTK_SAT_MODULE (widget)->cfgdata,
                              MOD_CFG_GLOBAL_SECTION,
@@ -484,7 +493,7 @@
                                     G_KEY_FILE_KEEP_COMMENTS, &error)) {
 
         g_key_file_free (module->cfgdata);
-
+		module->cfgdata=NULL;
         sat_log_log (SAT_LOG_LEVEL_ERROR,
                      _("%s: Could not load config data from %s (%s)."),
                      __FUNCTION__, cfgfile, error->message);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.