From: kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 28 Dec 2018 18:26:09 +0000 (+0000)
Subject: 2018-12-28  Steven G. Kargl  <kargl@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e29238879ae935ef84700fc75254a98e2925dc86;p=thirdparty%2Fgcc.git

2018-12-28  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/81984
	* intrinsics/string_intrinsics_inc.c: Placate the sanitizer.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@267452 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 03efb11a29df..8397eee66072 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-28  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/81984
+	* intrinsics/string_intrinsics_inc.c: Placate the sanitizer.
+
 2018-12-21  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/69121
diff --git a/libgfortran/intrinsics/string_intrinsics_inc.c b/libgfortran/intrinsics/string_intrinsics_inc.c
index bfec683f5280..b81c806db5de 100644
--- a/libgfortran/intrinsics/string_intrinsics_inc.c
+++ b/libgfortran/intrinsics/string_intrinsics_inc.c
@@ -87,6 +87,14 @@ compare_string (gfc_charlen_type len1, const CHARTYPE *s1,
   gfc_charlen_type len;
   int res;
 
+  /* Placate the sanitizer.  */
+  if (!s1 && !s2)
+    return 0;
+  if (!s1)
+    return -1;
+  if (!s2)
+    return 1;
+
   res = MEMCMP (s1, s2, ((len1 < len2) ? len1 : len2));
   if (res != 0)
     return res;