X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fgraph.c;h=da74afdef4e82c4eb8784bbb538b8757af8df3a1;hb=c84078d8498785e9a52945cc63fb663cd48027af;hp=a53a1913024cf41f5ac80d40be3a883a8c54a1e3;hpb=6ee48467ac46bb8553f6fb3782623559affb1b9c;p=pspp

diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c
index a53a191302..da74afdef4 100644
--- a/src/language/stats/graph.c
+++ b/src/language/stats/graph.c
@@ -245,6 +245,8 @@ parse_function (struct lexer *lexer, struct graph *graph)
       for (v = 0; v < ag_func[i].arity; ++v)
 	{
 	  graph->dep_vars[v] = parse_variable (lexer, graph->dict);
+	  if (! graph->dep_vars[v])
+	    goto error;
 	}
 
       if (!lex_force_match (lexer, T_RPAREN))
@@ -328,7 +330,13 @@ show_histogr (const struct graph *cmd, struct casereader *input)
 {
   struct histogram *histogram;
   struct ccase *c;
-
+  
+  if (cmd->es[0].cc <= 0)
+    {
+      casereader_destroy (input);
+      return;
+    }
+  
   {
     /* Sturges Rule */
     double bin_width = fabs (cmd->es[0].minimum - cmd->es[0].maximum)
@@ -490,7 +498,7 @@ run_barchart (struct graph *cmd, struct casereader *input)
 		     ag_func[cmd->agr].description);
       
     chart_item_submit (barchart_create (cmd->by_var, cmd->n_by_vars,
-					ds_cstr (&label),
+					ds_cstr (&label), false,
 					freqs, n_freqs));
 
     ds_destroy (&label);