Merge branch 'gawk-4.0-stable'

1 files changed, 18 insertions, 1 deletions

diff --git a/debug.c b/debug.c
index 5870a40f..37418115 100644
--- a/debug.c
+++ b/debug.c
@@ -493,8 +493,8 @@ source_find(char *src)
 				efree(path);
 				return s;
 			}
-		efree(path);
 		}
+		efree(path);
 	}
 
 	d_error(_("cannot find source file named `%s' (%s)"), src, strerror(errno_val));
@@ -2227,6 +2227,23 @@ set_breakpoint_at(INSTRUCTION *rp, int lineno, int silent)
 	INSTRUCTION *ip, *prevp;
 
 	for (prevp = rp, ip = rp->nexti; ip; prevp = ip, ip = ip->nexti) {
+		if (ip->opcode == Op_K_case) {
+			INSTRUCTION *i1, *i2;
+
+			/* Special case: the code line numbers for a switch do not form
+			 * a monotonically increasing sequence. Check if the line # is between
+			 * the first and last statements of the case block before continuing
+			 * the search.
+			 */ 
+			for (i2 = ip->stmt_start, i1 = i2->nexti; i2 != ip->stmt_end;
+								i2 = i1, i1 = i1->nexti) {
+				if (i1->source_line >= lineno)
+					return add_breakpoint(i2, i1, rp->source_file, silent);
+				if (i1 == ip->stmt_end)
+					break;
+			}
+		}
+
 		if (ip->source_line >= lineno)
 			return add_breakpoint(prevp, ip, rp->source_file, silent);
 		if (ip == (rp + 1)->lasti)