2 files changed, 24 insertions, 11 deletions
diff --git a/jim.c b/jim.c
index d49a205..ecf4c8b 100644
--- a/jim.c
+++ b/jim.c
@@ -15023,16 +15023,22 @@ wrongargs:
                     }
                     else if (errorCodeObj) {
                         int len = Jim_ListLength(interp, argv[idx + 1]);
-                        int i;
-
-                        ret = JIM_OK;
-                        /* Try to match the sublist against errorcode */
-                        for (i = 0; i < len; i++) {
-                            Jim_Obj *matchObj = Jim_ListGetIndex(interp, argv[idx + 1], i);
-                            Jim_Obj *objPtr = Jim_ListGetIndex(interp, errorCodeObj, i);
-                            if (Jim_StringCompareObj(interp, matchObj, objPtr, 0) != 0) {
-                                ret = -1;
-                                break;
+
+                        if (len > Jim_ListLength(interp, errorCodeObj)) {
+                            /* More elements in the sublist than in the errorCode so we can't match */
+                            ret = -1;
+                        }
+                        else {
+                            int i;
+                            ret = JIM_OK;
+                            /* Try to match the sublist against errorcode */
+                            for (i = 0; i < len; i++) {
+                                Jim_Obj *matchObj = Jim_ListGetIndex(interp, argv[idx + 1], i);
+                                Jim_Obj *objPtr = Jim_ListGetIndex(interp, errorCodeObj, i);
+                                if (Jim_StringCompareObj(interp, matchObj, objPtr, 0) != 0) {
+                                    ret = -1;
+                                    break;
+                                }
                             }
                         }
                     }
diff --git a/tests/try.test b/tests/try.test
index 0d76865..36a9bf9 100644
--- a/tests/try.test
+++ b/tests/try.test
@@ -104,7 +104,7 @@ test try-2.1 "try ... trap" -body {
 	try {
 		a
 	} trap CUSTOM {msg opts} {
-		list $msg $opts(-code) $opts(-errorcode)
+		list $msg [dict get $opts -code] [dict get $opts -errorcode]
 	}
 } -result {{custom errorcode} 1 {CUSTOM RESULT}}
 
@@ -140,6 +140,13 @@ test try-2.5 "trap match first but not second" -body {
 	}
 } -returnCodes error -result failed
 
+test try-2.6 "trap match too long" -body {
+	try {
+		apply {{} {return -code error -errorcode {FOO BAR} failed}}
+	} trap {FOO BAR BAZ} {msg opts} {
+		list trapped
+	}
+} -returnCodes error -result failed
 
 proc c {} {
 	try {