From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Tue, 21 Jan 2014 02:18:14 +0000 (+0900)
Subject: skin: remove null pointer dereferences
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~507^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efe1a91335a44f2ad10d3933124020d147586d82;p=sdk%2Femulator%2Fqemu.git

skin: remove null pointer dereferences

Change-Id: I420cef201f172ca88aa06431aba3e63bcb44182c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java
index 6f7a7860b5..b4f945509a 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/log/SkinLogger.java
@@ -119,12 +119,14 @@ public class SkinLogger {
 
 			/* delete .lck files after abnormal skin termination */
 			File[] listFiles = dir.listFiles();
-			for (File f : listFiles) {
-				String name = f.getName();
-
-				if (!FILE_NAME.equals(name) && name.startsWith(FILE_NAME)) {
-					if (f.delete() == false) {
-						/* do nothing */
+			if (listFiles != null) {
+				for (File f : listFiles) {
+					String name = f.getName();
+
+					if (!FILE_NAME.equals(name) && name.startsWith(FILE_NAME)) {
+						if (f.delete() == false) {
+							/* do nothing */
+						}
 					}
 				}
 			}
diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
index 33b114b381..5044200754 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/menu/PopupMenu.java
@@ -538,7 +538,7 @@ public class PopupMenu {
 			};
 
 			File[] layoutPaths = pathRoot.listFiles(filter);
-			if (layoutPaths.length <= 0) {
+			if (layoutPaths == null || layoutPaths.length <= 0) {
 				logger.info("the layout of key window not found");
 				return null;
 			}