From 53e9fc791548ee0f81d6e749304359c0c335952d Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Wed, 9 Nov 2016 10:14:35 -0800
Subject: [PATCH] liblog: android_closeEventTagMap pointer check

Followup to c/278768 where failure to open tag map can
result in segment violation in android_closeEventTagMap.
Add check for pointer value = -1 to bypass call to close.

Test: gTest liblog-unit-tests, logcat-unit-tests & logd-unit-tests
Bug: 30963384
Bug: 31456426
Change-Id: I20547e55d7e29682fde4538bc1fc6d83b4535d49
---
 liblog/logger_write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liblog/logger_write.c b/liblog/logger_write.c
index c481e366a..157bd88a1 100644
--- a/liblog/logger_write.c
+++ b/liblog/logger_write.c
@@ -189,7 +189,7 @@ LIBLOG_ABI_PUBLIC void __android_log_close()
     __android_log_unlock();
 
 #if defined(__BIONIC__)
-    android_closeEventTagMap(m);
+    if (m != (EventTagMap *)(uintptr_t)-1LL) android_closeEventTagMap(m);
 #endif
 
 }