aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/ldexp.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2db90b5..c1a37c1 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-01 Simon Marchi <simon.marchi@ericsson.com>
+
+ * ldexp.c (fold_name, exp_fold_tree_1): Avoid pointer arithmetic
+ on NULL pointer.
+
2018-01-31 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/ld-elf/pr21964-5.c (my_var): Mark as used.
diff --git a/ld/ldexp.c b/ld/ldexp.c
index a097205..bf0df44 100644
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -782,7 +782,7 @@ fold_name (etree_type *tree)
if (expld.assign_src == NULL)
expld.assign_src = h;
else
- expld.assign_src = (struct bfd_link_hash_entry *) 0 - 1;
+ expld.assign_src = (struct bfd_link_hash_entry *) - 1;
}
break;
@@ -1207,7 +1207,7 @@ exp_fold_tree_1 (etree_type *tree)
false branches.) */
if (expld.assign_src != NULL
&& (expld.assign_src
- != (struct bfd_link_hash_entry *) 0 - 1))
+ != (struct bfd_link_hash_entry *) -1))
bfd_copy_link_hash_symbol_type (link_info.output_bfd, h,
expld.assign_src);
}