(close_active_file) Remove unnecessary test.

[pspp-builds.git] / src / value-labels.c

diff --git a/src/value-labels.c b/src/value-labels.c
index 91dd1702e1f69beaac15933077d8b27beb90c3e7..7cd8ff0daa3cd76c5d3aa902dbd13da8052453d9 100644 (file)
--- a/src/value-labels.c
+++ b/src/value-labels.c
@@ -14,16 +14,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "value-labels.h"
 #include "error.h"
 #include <stdlib.h>
-#include <string.h>
 #include "alloc.h"
 #include "hash.h"
+#include "str.h"
 
 static hsh_compare_func compare_int_val_lab;
 static hsh_hash_func hash_int_val_lab;
@@ -500,7 +500,13 @@ value_to_string(const union value *val, const struct variable *var)
 {
   static char buf[100];
   char *s;
-  const struct val_labs *val_labs = var->val_labs;
+  const struct val_labs *val_labs ;
+  
+  if ( !val || ! var ) 
+    return 0;
+
+  val_labs = var->val_labs;
+
   
   s = val_labs_find (val_labs, *val);