From 80c8fcd6a6fdedc22cd8f07895fdf72eba9bf614 Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Sun, 17 Jul 2016 23:03:48 +0900 Subject: [PATCH] Added code for checking NULL value when searching layout index Change-Id: I4c0e64f4488de914d6309f353e33335fc7008e12 --- xmlresource/layout_parser.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/xmlresource/layout_parser.cpp b/xmlresource/layout_parser.cpp index 0a5edde..c78afdb 100644 --- a/xmlresource/layout_parser.cpp +++ b/xmlresource/layout_parser.cpp @@ -348,12 +348,14 @@ LayoutParserImpl::release_key_strings() { int LayoutParserImpl::get_layout_index(const char *name) { - string strName = (string)name; - vector::iterator it; - // make sure that the m_file_names are sorted. - it = lower_bound(m_file_names.begin(), m_file_names.end(), strName); - if (it != m_file_names.end() && *it == strName) { - return it-m_file_names.begin(); + if (name) { + string strName = (string)name; + vector::iterator it; + // make sure that the m_file_names are sorted. + it = lower_bound(m_file_names.begin(), m_file_names.end(), strName); + if (it != m_file_names.end() && *it == strName) { + return it - m_file_names.begin(); + } } return NOT_USED; } -- 2.7.4