From 63b69b312c8e89b19422b5e0bae02c80858e6f6e Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 2 Jul 2010 23:43:09 +0000
Subject: mp_msg.c: Avoid out-of-bounds read if empty string is printed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31626 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp_msg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mp_msg.c')

diff --git a/mp_msg.c b/mp_msg.c
index ab7b969c84..ff8420833f 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -234,7 +234,9 @@ void mp_msg_va(int mod, int lev, const char *format, va_list va)
     if (header)
         print_msg_module(stream, mod);
     set_msg_color(stream, lev);
-    header = tmp[strlen(tmp)-1] == '\n' || tmp[strlen(tmp)-1] == '\r';
+
+    size_t len = strlen(tmp);
+    header = len && (tmp[len-1] == '\n' || tmp[len-1] == '\r');
 
     fprintf(stream, "%s", tmp);
     if (mp_msg_color)
-- 
cgit v1.2.3