projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model-checker: Add more progress functions.
[pspp-builds.git]
/
src
/
data
/
dictionary.c
diff --git
a/src/data/dictionary.c
b/src/data/dictionary.c
index 1c50ac7feb26976ea1e9b63d835961a5ae3db243..2dd1dfc4641108a08deb9b3e054acb7e872e53da 100644
(file)
--- a/
src/data/dictionary.c
+++ b/
src/data/dictionary.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-78,7
+78,8
@@
struct dictionary
void
dict_set_encoding (struct dictionary *d, const char *enc)
{
void
dict_set_encoding (struct dictionary *d, const char *enc)
{
- d->encoding = strdup (enc);
+ if (enc)
+ d->encoding = xstrdup (enc);
}
const char *
}
const char *
@@
-211,7
+212,8
@@
dict_clone (const struct dictionary *s)
for (i = 0; i < s->vector_cnt; i++)
d->vector[i] = vector_clone (s->vector[i], s, d);
for (i = 0; i < s->vector_cnt; i++)
d->vector[i] = vector_clone (s->vector[i], s, d);
- d->encoding = strdup (s->encoding);
+ if ( s->encoding)
+ d->encoding = xstrdup (s->encoding);
dict_set_attributes (d, dict_get_attributes (s));
dict_set_attributes (d, dict_get_attributes (s));