From e511af54306c3837c408239e14afddeee2bcb71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Fri, 4 Apr 2014 19:31:56 +0200 Subject: [PATCH] Issue #557 private namespaces fix (nullpointer) --- .../com/jpexs/decompiler/flash/abc/avm2/AVM2Deobfuscation.java | 3 +++ trunk/src/com/jpexs/decompiler/flash/gui/Main.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Deobfuscation.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Deobfuscation.java index d1521cc65..c6d5efe9a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Deobfuscation.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Deobfuscation.java @@ -85,6 +85,9 @@ public class AVM2Deobfuscation { } public String builtInNs(String ns) { + if(ns == null){ + return null; + } if (ns.equals("http://www.adobe.com/2006/actionscript/flash/proxy")) { return "flash.utils.flash_proxy"; } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java index 4e299a1b9..05c4cfd9a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java @@ -893,7 +893,7 @@ public class Main { * @param args the command line arguments * @throws IOException */ - public static void main(String[] args) throws IOException { + public static void main(String[] args) throws IOException { startFreeMemThread(); initLogging(Configuration.debugMode.get()); initLang();