From c2d8db822832b9465f5cd445640be69d2a98ddfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= <jindra.petrik@gmail.com>
Date: Sun, 24 Mar 2013 10:11:45 +0100
Subject: [PATCH] AS1/2 ignoring disassembly errors

---
 trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java | 2 +-
 trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java     | 2 +-
 trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java | 2 +-
 .../src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java | 2 +-
 .../src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
index ad1ffeb05..cb5df960a 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineButtonTag.java
@@ -147,7 +147,7 @@ public class DefineButtonTag extends CharacterTag implements ASMSource, BoundedT
          ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
          rri.setPos(prevLength);
          return Action.removeNops(SWFInputStream.readActionList(rri, version, prevLength), version);
-      } catch (IOException ex) {
+      } catch (Exception ex) {
          Logger.getLogger(DoActionTag.class.getName()).log(Level.SEVERE, null, ex);
          return new ArrayList<Action>();
       }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
index ec0bdef50..23f24e309 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoActionTag.java
@@ -110,7 +110,7 @@ public class DoActionTag extends Tag implements ASMSource {
          ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
          rri.setPos(prevLength);
          return Action.removeNops(SWFInputStream.readActionList(rri, version, prevLength), version);
-      } catch (IOException ex) {
+      } catch (Exception ex) {
          Logger.getLogger(DoActionTag.class.getName()).log(Level.SEVERE, null, ex);
          return new ArrayList<Action>();
       }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
index 4a7fcd816..20a1ae500 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DoInitActionTag.java
@@ -117,7 +117,7 @@ public class DoInitActionTag extends CharacterTag implements ASMSource {
          ReReadableInputStream rri = new ReReadableInputStream(new ByteArrayInputStream(baos.toByteArray()));
          rri.setPos(prevLength);
          return Action.removeNops(SWFInputStream.readActionList(rri, version, prevLength), version);
-      } catch (IOException ex) {
+      } catch (Exception ex) {
          Logger.getLogger(DoActionTag.class.getName()).log(Level.SEVERE, null, ex);
          return new ArrayList<Action>();
       }
diff --git a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
index f37a8f149..2bc0d79bf 100644
--- a/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
+++ b/trunk/src/com/jpexs/decompiler/flash/types/BUTTONCONDACTION.java
@@ -134,7 +134,7 @@ public class BUTTONCONDACTION implements ASMSource {
    public List<Action> getActions(int version) {
       try {
          return Action.removeNops(SWFInputStream.readActionList(new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0), version);
-      } catch (IOException ex) {
+      } catch (Exception ex) {
          Logger.getLogger(BUTTONCONDACTION.class.getName()).log(Level.SEVERE, null, ex);
          return new ArrayList<Action>();
       }
diff --git a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
index d51ade343..e525f66b0 100644
--- a/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
+++ b/trunk/src/com/jpexs/decompiler/flash/types/CLIPACTIONRECORD.java
@@ -91,10 +91,11 @@ public class CLIPACTIONRECORD implements ASMSource {
       return true;
    }
 
+   @Override
    public List<Action> getActions(int version) {
       try {
          return Action.removeNops(SWFInputStream.readActionList(new ReReadableInputStream(new ByteArrayInputStream(actionBytes)), version, 0), version);
-      } catch (IOException ex) {
+      } catch (Exception ex) {
          Logger.getLogger(BUTTONCONDACTION.class.getName()).log(Level.SEVERE, null, ex);
          return new ArrayList<Action>();
       }