Merge lp:~kamalmostafa/ubuntu/lucid/antennavis/fix-120923-crash into lp:ubuntu/lucid/antennavis

[Kamal Mostafa]

=== modified file 'debian/changelog'
--- debian/changelog	2009-10-30 20:39:37 +0000
+++ debian/changelog	2010-02-13 04:37:13 +0000
@@ -1,3 +1,9 @@
+antennavis (0.3-6ubuntu1) lucid; urgency=low
+
+  * Fix segfault crash when no loading a file with no GW lines. (LP: #120923)
+
+ -- Kamal Mostafa <[e-mail]>  Fri, 12 Feb 2010 19:40:14 -0800
+
 antennavis (0.3-6) unstable; urgency=low
 
   * Retiring - set the package maintainer to Debian QA Group.

=== modified file 'debian/control'
--- debian/control	2009-10-30 20:39:37 +0000
+++ debian/control	2010-02-13 04:37:13 +0000
@@ -1,7 +1,8 @@
 Source: antennavis
 Section: hamradio
 Priority: optional
-Maintainer: Debian QA Group <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
 Build-Depends: debhelper (>= 5.0.0), tcl8.4-dev, tk8.4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxmu-dev
 Standards-Version: 3.7.2
 

=== modified file 'pcard.c'
--- pcard.c	2006-06-23 21:31:11 +0000
+++ pcard.c	2010-02-13 04:37:13 +0000
@@ -564,6 +564,13 @@
     }  /**  For each card  **/
     fclose(fin);
 
+    /**  Check whether we read any tubes at all before proceeding. **/
+    if ( antData->first_tube == NULL ) {
+      fprintf(stderr, "No geometry tubes (GW lines) specified in file %s\n",
+              file_name);
+      return;
+    }
+
     /**  Traverse list of elements to find dynamic range  **/
     /**  We will need to scale things to accomodate all   **/
     /**  sizes of antennas.                               **/