projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bugs #11722 and #11676
[pspp]
/
src
/
tab.c
diff --git
a/src/tab.c
b/src/tab.c
index 8afb8f0be0e3793d85675de5dc6fd5d87867e6b2..201f0d8221c45f29c3c96391577299561a0dc242 100644
(file)
--- a/
src/tab.c
+++ b/
src/tab.c
@@
-210,6
+210,12
@@
void
tab_headers (struct tab_table *table, int l, int r, int t, int b)
{
assert (table != NULL);
tab_headers (struct tab_table *table, int l, int r, int t, int b)
{
assert (table != NULL);
+ assert (l < table->nc);
+ assert (r < table->nc);
+ assert (t < table->nr);
+ assert (b < table->nr);
+
+
table->l = l;
table->r = r;
table->t = t;
table->l = l;
table->r = r;
table->t = t;
@@
-862,11
+868,12
@@
tab_flags (struct tab_table *t, unsigned flags)
void
tab_submit (struct tab_table *t)
{
void
tab_submit (struct tab_table *t)
{
- struct som_
table
s;
+ struct som_
entity
s;
assert (t != NULL);
s.class = &tab_table_class;
s.ext = t;
assert (t != NULL);
s.class = &tab_table_class;
s.ext = t;
+ s.type = SOM_TABLE;
som_submit (&s);
tab_destroy (t);
}
som_submit (&s);
tab_destroy (t);
}
@@
-921,9
+928,11
@@
int tab_hit;
/* Set the current table to TABLE. */
static void
/* Set the current table to TABLE. */
static void
-tabi_table (struct som_
table
*table)
+tabi_table (struct som_
entity
*table)
{
assert (table != NULL);
{
assert (table != NULL);
+ assert (table->type == SOM_TABLE);
+
t = table->ext;
tab_offset (t, 0, 0);
t = table->ext;
tab_offset (t, 0, 0);