feat(objectionary#757): add safe checks to the method properties parsing

volodya-lombrozo · Oct 14, 2024 · 40533a4 · 40533a4
1 parent 3806d81
commit 40533a4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/...esentation/xmir/XmirParsingException.java → ...representation/xmir/ParsingException.java b/...esentation/xmir/XmirParsingException.java → ...representation/xmir/ParsingException.java
@@ -28,7 +28,7 @@
  * This exception is thrown when XMIR parsing fails.
  * @since 0.6
  */
-final class XmirParsingException extends IllegalStateException {
+final class ParsingException extends IllegalStateException {
 
     /**
      * Serial version UID.
@@ -40,7 +40,7 @@ final class XmirParsingException extends IllegalStateException {
      * @param message Message.
      * @param cause Cause.
      */
-    XmirParsingException(final String message, final Throwable cause) {
+    ParsingException(final String message, final Throwable cause) {
         super(message, cause);
     }
 }
diff --git a/src/main/java/org/eolang/jeo/representation/xmir/XmlClass.java b/src/main/java/org/eolang/jeo/representation/xmir/XmlClass.java
@@ -111,7 +111,7 @@ public BytecodeClass bytecode() {
                 this.properties().bytecode()
             );
         } catch (final IllegalStateException exception) {
-            throw new XmirParsingException(
+            throw new ParsingException(
                 String.format(
                     "Unexpected exception during parsing the class '%s'",
                     this.name()

diff --git a/src/main/java/org/eolang/jeo/representation/xmir/XmlMethod.java b/src/main/java/org/eolang/jeo/representation/xmir/XmlMethod.java
@@ -131,7 +131,7 @@ public BytecodeMethod bytecode() {
                     .orElse(new BytecodeMaxs(0, 0))
             );
         } catch (final IllegalStateException exception) {
-            throw new XmirParsingException(
+            throw new ParsingException(
                 String.format(
                     "Unexpected exception during parsing the method '%s'",
                     this.name()
@@ -183,14 +183,24 @@ private Optional<XmlMaxs> maxs() {
      * @return Properties.
      */
     private BytecodeMethodProperties properties() {
-        return new BytecodeMethodProperties(
-            this.access(),
-            this.name(),
-            this.descriptor(),
-            this.signature(),
-            this.params(),
-            this.exceptions()
-        );
+        try {
+            return new BytecodeMethodProperties(
+                this.access(),
+                this.name(),
+                this.descriptor(),
+                this.signature(),
+                this.params(),
+                this.exceptions()
+            );
+        } catch (final IllegalStateException exception) {
+            throw new ParsingException(
+                String.format(
+                    "Unexpected exception during parsing the method '%s' properties",
+                    this.name()
+                ),
+                exception
+            );
+        }
     }
 
     /**

diff --git a/src/main/java/org/eolang/jeo/representation/xmir/XmlProgram.java b/src/main/java/org/eolang/jeo/representation/xmir/XmlProgram.java
@@ -105,7 +105,7 @@ public BytecodeProgram bytecode() {
         try {
             return new BytecodeProgram(this.pckg(), this.top().bytecode());
         } catch (final IllegalStateException exception) {
-            throw new XmirParsingException(
+            throw new ParsingException(
                 String.format(
                     "Unexpected exception during parsing the program in package '%s'",
                     this.pckg()