core: return & break are absorbed in expressions

return & break inside an expression do not cause the current route
block or while/switch statement to end.
E.g.: $v = { return 1; }  will not end the current route, will
only set $v to 1.

lvalue.c

@@ -107,9 +107,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg,
 			break;
 		case RV_ACTION_ST:
 			flags=avp->type & ~AVP_VAL_STR;
-			if (rv->v.action)
+			if (rv->v.action) {
 				value.n=run_actions_safe(h, rv->v.action, msg);
-			else
+				h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return &
+														    break in expr*/
+			} else
 				value.n=-1;
 			ret=value.n;
 			break;
@@ -282,9 +284,11 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg,
 			break;
 		case RV_ACTION_ST:
 			pval.flags=PV_TYPE_INT|PV_VAL_INT;
-			if (rv->v.action)
+			if (rv->v.action) {
 				pval.ri=run_actions_safe(h, rv->v.action, msg);
-			else
+				h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return &
+														    break in expr*/
+			} else
 				pval.ri=0;
 			ret=pval.ri;
 			break;

rvalue.c

@@ -900,9 +900,11 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg,
 			}
 			break;
 		case RV_ACTION_ST:
-			if (rv->v.action)
+			if (rv->v.action) {
 				*i=(run_actions_safe(h, rv->v.action, msg)>0);
-			else
+				h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return &
+														    break in expr*/
+			} else
 				*i=0;
 			break;
 		case RV_SEL:
@@ -1099,9 +1101,11 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg,
 			*tmpv=rv->v.s;
 			break;
 		case RV_ACTION_ST:
-			if (rv->v.action)
+			if (rv->v.action) {
 				i=(run_actions_safe(h, rv->v.action, msg)>0);
-			else
+				h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return &
+														    break in expr*/
+			} else
 				i=0;
 			tmpv->s=sint2strbuf(i, tmp_cache->i2s,
 								sizeof(tmp_cache->i2s), &tmpv->len);