projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update widgets.c from psppsheet branch
[pspp]
/
src
/
data
/
value-labels.c
diff --git
a/src/data/value-labels.c
b/src/data/value-labels.c
index 0b2ae3f6323575dc9711c1de1f8b88f4e34d0df4..c405961f29d69b29a24b767b0095c5029932425d 100644
(file)
--- a/
src/data/value-labels.c
+++ b/
src/data/value-labels.c
@@
-362,7
+362,13
@@
val_labs_equal (const struct val_labs *a, const struct val_labs *b)
{
const struct val_lab *label;
{
const struct val_lab *label;
- if (val_labs_count (a) != val_labs_count (b) || a->width != b->width)
+ if (val_labs_count (a) != val_labs_count (b))
+ return false;
+
+ if (a == NULL || b == NULL)
+ return true;
+
+ if (a->width != b->width)
return false;
HMAP_FOR_EACH (label, struct val_lab, node, &a->labels)
return false;
HMAP_FOR_EACH (label, struct val_lab, node, &a->labels)