[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp tests/automake.mk tests/ChangeLog src/lang...
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] pspp tests/automake.mk tests/ChangeLog src/lang... |
Date: |
Mon, 17 Mar 2008 03:59:06 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 08/03/17 03:59:06
Modified files:
tests : automake.mk ChangeLog
src/language/stats: crosstabs.q ChangeLog
Added files:
tests/bugs : crosstabs-crash2.sh
Log message:
Fix bug #22037.
* crosstabs.q (calc_general): Only the short string prefix of long
string variables are tabulated, so we must not copy or zero out
more data than that.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/crosstabs-crash2.sh?cvsroot=pspp&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/automake.mk?cvsroot=pspp&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/crosstabs.q?cvsroot=pspp&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.73&r2=1.74
Patches:
Index: tests/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/automake.mk,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- tests/automake.mk 16 Mar 2008 22:38:17 -0000 1.56
+++ tests/automake.mk 17 Mar 2008 03:59:06 -0000 1.57
@@ -100,6 +100,7 @@
tests/bugs/compression.sh \
tests/bugs/crosstabs.sh \
tests/bugs/crosstabs-crash.sh \
+ tests/bugs/crosstabs-crash2.sh \
tests/bugs/curtailed.sh \
tests/bugs/data-crash.sh \
tests/bugs/double-frequency.sh \
Index: tests/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- tests/ChangeLog 16 Mar 2008 22:38:17 -0000 1.125
+++ tests/ChangeLog 17 Mar 2008 03:59:06 -0000 1.126
@@ -1,5 +1,13 @@
2008-03-16 Ben Pfaff <address@hidden>
+ Bug #22037.
+
+ * automake.mk: Add new test.
+
+ * bugs/crosstabs-crash2.sh: New test.
+
+2008-03-16 Ben Pfaff <address@hidden>
+
Patch #6452. Reviewed by John Darrington.
* automake.mk: Add new test.
Index: src/language/stats/crosstabs.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/crosstabs.q,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/language/stats/crosstabs.q 8 Dec 2007 06:05:35 -0000 1.38
+++ src/language/stats/crosstabs.q 17 Mar 2008 03:59:06 -0000 1.39
@@ -637,12 +637,14 @@
te->values[j].f = case_num (c, x->vars[j]);
else
{
- memcpy (te->values[j].s, case_str (c, x->vars[j]),
- var_get_width (x->vars[j]));
+ size_t n = var_get_width (x->vars[j]);
+ if (n > MAX_SHORT_STRING)
+ n = MAX_SHORT_STRING;
+ memcpy (te->values[j].s, case_str (c, x->vars[j]), n);
/* Necessary in order to simplify comparisons. */
memset (&te->values[j].s[var_get_width (x->vars[j])], 0,
- sizeof (union value) - var_get_width (x->vars[j]));
+ sizeof (union value) - n);
}
}
}
Index: src/language/stats/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- src/language/stats/ChangeLog 11 Mar 2008 03:28:49 -0000 1.73
+++ src/language/stats/ChangeLog 17 Mar 2008 03:59:06 -0000 1.74
@@ -1,3 +1,11 @@
+2008-03-16 Ben Pfaff <address@hidden>
+
+ Bug #22037. Thanks to John Darrington for reporting this bug.
+
+ * crosstabs.q (calc_general): Only the short string prefix of long
+ string variables are tabulated, so we must not copy or zero out
+ more data than that.
+
2008-03-10 Jason Stover <address@hidden>
* regression.q (run_regression): Removed code for EXPORT
Index: tests/bugs/crosstabs-crash2.sh
===================================================================
RCS file: tests/bugs/crosstabs-crash2.sh
diff -N tests/bugs/crosstabs-crash2.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/bugs/crosstabs-crash2.sh 17 Mar 2008 03:59:06 -0000 1.1
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# This program tests for bug #22037, which caused CROSSTABS to crash.
+
+TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+
+# ensure that top_builddir are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
+
+# ensure that top_srcdir is absolute
+top_srcdir=`cd $top_srcdir; pwd`
+
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
+
+LANG=C
+export LANG
+
+cleanup()
+{
+ cd /
+ rm -rf $TEMPDIR
+}
+
+
+fail()
+{
+ echo $activity
+ echo FAILED
+ cleanup;
+ exit 1;
+}
+
+
+no_result()
+{
+ echo $activity
+ echo NO RESULT;
+ cleanup;
+ exit 2;
+}
+
+pass()
+{
+ cleanup;
+ exit 0;
+}
+
+mkdir -p $TEMPDIR
+
+cd $TEMPDIR
+
+activity="create program"
+cat > $TESTFILE <<EOF
+data list list /x * y (a18).
+
+begin data.
+
+ 1. 'zero none'
+
+1 'one unity'
+2 'two duality'
+3 'three lots'
+end data.
+
+CROSSTABS /TABLES = x BY y.
+EOF
+if [ $? -ne 0 ] ; then no_result ; fi
+
+$SUPERVISOR $PSPP --testing-mode $TESTFILE > /dev/null
+if [ $? -ne 0 ] ; then no_result ; fi
+
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b -w $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST. Reading free-form data from INLINE.
++--------+------+
+|Variable|Format|
+#========#======#
+|x |F8.0 |
+|y |A18 |
++--------+------+
+$TEMPDIR/crosstabs-crash2.sh.sps:4: warning: BEGIN DATA: Missing value(s) for
all variables from x onward. These will be filled with the system-missing
value or blanks, as appropriate.
+$TEMPDIR/crosstabs-crash2.sh.sps:6: warning: BEGIN DATA: Missing value(s) for
all variables from x onward. These will be filled with the system-missing
value or blanks, as appropriate.
+2.1 CROSSTABS. Summary.
+#===============#=====================================================#
+# # Cases #
+# #-----------------+-----------------+-----------------#
+# # Valid | Missing | Total #
+# #--------+--------+--------+--------+--------+--------#
+# # N| Percent| N| Percent| N| Percent#
+#---------------#--------+--------+--------+--------+--------+--------#
+#x * y # 4| 66.7%| 2| 33.3%| 6| 100.0%#
+#===============#========#========#========#========#========#========#
+2.2 CROSSTABS. x by y [count].
+#===============#===================================#========#
+# # y | #
+# #--------+--------+--------+--------+ #
+# x#one unit|three lo|two dual|zero non| Total #
+#---------------#--------+--------+--------+--------+--------#
+# 1.00# 1.0| .0| .0| 1.0| 2.0#
+# 2.00# .0| .0| 1.0| .0| 1.0#
+# 3.00# .0| 1.0| .0| .0| 1.0#
+#Total # 1.0%| 1.0%| 1.0%| 1.0%| 4.0%#
+#===============#========#========#========#========#========#
+EOF
+if [ $? -ne 0 ] ; then fail ; fi
+
+pass;