Merge pull request #4522 from andreast271/link_conflict_crash

Avoid crash in linking conflict report by providing correct type for …

Author: tautschnig

regression/ansi-c/linking_conflicts2/main.c

@@ -0,0 +1,4 @@
+int foo(int *i)
+{
+  return *i;
+}

regression/ansi-c/linking_conflicts2/other.c

@@ -0,0 +1,4 @@
+int foo(char *i)
+{
+  return *i;
+}

regression/ansi-c/linking_conflicts2/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+other.c
+^EXIT=(64|1)$
+^SIGNAL=0$
+^CONVERSION ERROR$
+error: conflicting function declarations `foo'
+--
+^warning: ignoring

src/linking/linking.cpp

@@ -143,7 +143,8 @@ void linkingt::detailed_conflict_report_rec(
     if(depth>0 &&
        !base_type_eq(t1.subtype(), t2.subtype(), ns))
     {
-      conflict_path=dereference_exprt(conflict_path);
+      if(conflict_path.type().id() == ID_pointer)
+        conflict_path = dereference_exprt(conflict_path);
 
       detailed_conflict_report_rec(
         old_symbol,