From 394340583fd5aee9ba2e6733081ac70dae633833 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 29 Jul 2013 16:50:36 +0000
Subject: [PATCH] ide: Fixed empty name issue Navigator #497

git-svn-id: svn://ultimatepp.org/upp/trunk@6214 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Sql/Sqls.h           | 2 +-
 uppsrc/ide/Browser/Item.cpp | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/uppsrc/Sql/Sqls.h b/uppsrc/Sql/Sqls.h
index b2b5f1e7e..1b1829741 100644
--- a/uppsrc/Sql/Sqls.h
+++ b/uppsrc/Sql/Sqls.h
@@ -250,7 +250,7 @@ public:
 	String Savepoint(); // deprecated
 	void   RollbackTo(const String& savepoint); // deprecated
 
-	bool   IsOpen(); // 
+	bool   IsOpen();
 
 	bool   WasError() const; // deprecated, use SqlSession::WasError
 
diff --git a/uppsrc/ide/Browser/Item.cpp b/uppsrc/ide/Browser/Item.cpp
index 7761798a3..be6067d0a 100644
--- a/uppsrc/ide/Browser/Item.cpp
+++ b/uppsrc/ide/Browser/Item.cpp
@@ -74,6 +74,9 @@ Vector<ItemTextPart> ParseItemNatural(const String& name, const CppItem& m, cons
 	LLOG("ParseItemNatural " << m.natural << ", pname: " << m.pname
 	                         << ", tname: " << m.tname << ", m.ctname: " << m.ctname);
 	Vector<ItemTextPart> part;
+	int len = name.GetLength();
+	if(len == 0)
+		return part;
 	bool param = false;
 	int pari = -1;
 	int par = 0;
@@ -90,9 +93,9 @@ Vector<ItemTextPart> ParseItemNatural(const String& name, const CppItem& m, cons
 		}
 		else
 		if(iscid(*s) || *s == ':') {
-			if(strncmp(s, name, name.GetLength()) == 0 && !iscid(s[name.GetLength()])) {
+			if(strncmp(s, name, len) == 0 && !iscid(s[len])) {
 				p.type = ITEM_NAME;
-				n = name.GetLength();
+				n = len;
 				param = true;
 			}
 			else {