summaryrefslogtreecommitdiff
path: root/gcc/fortran/primary.c
diff options
context:
space:
mode:
authorTobias Schlüter <tobi@gcc.gnu.org>2005-02-24 19:26:27 +0100
committerTobias Schlüter <tobi@gcc.gnu.org>2005-02-24 19:26:27 +0100
commitcb9e4f55b0bfcbf3b25213774193d4a4bb8a8342 (patch)
tree2139266e39d005be3049810c27d9856644ae20f4 /gcc/fortran/primary.c
parentef6201a68e43c0c72daadaafaff4a76dad8b0262 (diff)
downloadgcc-cb9e4f55b0bfcbf3b25213774193d4a4bb8a8342.tar.gz
Unrevert previously reversed patch, adding this patch:
* module.c (find_true_name): Deal with NULL module. From-SVN: r95506
Diffstat (limited to 'gcc/fortran/primary.c')
-rw-r--r--gcc/fortran/primary.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index f122779b136..f3c51ab4675 100644
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -1273,7 +1273,7 @@ match_keyword_arg (gfc_actual_arglist * actual, gfc_actual_arglist * base)
if (name[0] != '\0')
{
for (a = base; a; a = a->next)
- if (strcmp (a->name, name) == 0)
+ if (a->name != NULL && strcmp (a->name, name) == 0)
{
gfc_error
("Keyword '%s' at %C has already appeared in the current "
@@ -1282,7 +1282,7 @@ match_keyword_arg (gfc_actual_arglist * actual, gfc_actual_arglist * base)
}
}
- strcpy (actual->name, name);
+ actual->name = gfc_get_string (name);
return MATCH_YES;
cleanup: