FIX: System crash when reading any http request

fixes: #11
related to: metaeducation/rebol-issues#2362

Author: Oldes

src/core/t-event.c

@@ -120,15 +120,24 @@
 	case SYM_OFFSET:
 		if (IS_PAIR(val)) {
 			SET_EVENT_XY(value, Float_Int16(VAL_PAIR_X(val)), Float_Int16(VAL_PAIR_Y(val)));
+			CLR_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_CODE);
+			SET_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_XY);
+			break;
 		}
-		else return FALSE;
-		break;
+		//O: should it be possible to remove offset value from event?
+		//else if (IS_NONE(val)) {
+		//	CLR_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_XY);
+		//}
+		return FALSE;
 
 	case SYM_KEY:
 		//VAL_EVENT_TYPE(value) != EVT_KEY && VAL_EVENT_TYPE(value) != EVT_KEY_UP)
 		VAL_EVENT_MODEL(value) = EVM_GUI;
 		if (IS_CHAR(val)) {
 			VAL_EVENT_DATA(value) = VAL_CHAR(val);
+			CLR_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_XY);
+			SET_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_CODE);
+			break;
 		}
 		else if (IS_LIT_WORD(val) || IS_WORD(val)) {
 			arg = Get_System(SYS_VIEW, VIEW_EVENT_KEYS);
@@ -143,20 +152,21 @@
 				if (IS_END(arg)) return FALSE;
 				break;
 			}
-			return FALSE;
 		}
-		else return FALSE;
-		break;
+		return FALSE;
 
 	case SYM_CODE:
+		//if (GET_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_XY)) return FALSE;
 		if (IS_INTEGER(val)) {
-			VAL_EVENT_DATA(value) = VAL_INT32(val);
+			VAL_EVENT_DATA(value) = VAL_INT64(val);
+			CLR_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_XY);
+			SET_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_CODE);
+			break;
 		}
-		else return FALSE;
-		break;
+		return FALSE;
 
 	default:
-			return FALSE;
+		return FALSE;
 	}
 
 	return TRUE;
@@ -210,7 +220,7 @@
 			*val = *Get_System(SYS_VIEW, VIEW_EVENT_PORT);
 		}
 		// Event holds a port:
-		else if (IS_PORT(value) && (IS_EVENT_MODEL(value, EVM_PORT) || IS_EVENT_MODEL(value, EVM_MIDI))) {
+		else if (IS_EVENT_MODEL(value, EVM_PORT) || IS_EVENT_MODEL(value, EVM_MIDI)) {
 			SET_PORT(val, VAL_EVENT_SER(value));
 		}
 		// Event holds an object:
@@ -242,12 +252,13 @@
 		goto is_none;
 
 	case SYM_OFFSET:
-		if (IS_EVENT_MODEL(value, EVM_GUI) && VAL_EVENT_TYPE(value) != EVT_KEY && VAL_EVENT_TYPE(value) != EVT_KEY_UP) {
+		if (GET_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_XY)) {
 			VAL_SET(val, REB_PAIR);
 			VAL_PAIR_X(val) = (REBD32)VAL_EVENT_X(value);
 			VAL_PAIR_Y(val) = (REBD32)VAL_EVENT_Y(value);
-		} else goto is_none;
-		break;
+			break;
+		}
+		goto is_none;
 
 	case SYM_KEY:
 		if (VAL_EVENT_TYPE(value) != EVT_KEY && VAL_EVENT_TYPE(value) != EVT_KEY_UP)
@@ -285,11 +296,11 @@
 		break;
 
 	case SYM_CODE:
-		if (VAL_EVENT_TYPE(value) != EVT_KEY && VAL_EVENT_TYPE(value) != EVT_KEY_UP)
-			goto is_none;
-		n = VAL_EVENT_DATA(value); // key-words in top 16, chars in lower 16
-		SET_INTEGER(val, n);
-		break;
+		if (GET_FLAG(VAL_EVENT_FLAGS(value), EVF_HAS_CODE)) {
+			SET_INTEGER(val, VAL_EVENT_DATA(value)); // key-words in top 16, chars in lower 16
+			break;
+		}
+		goto is_none;
 
 	case SYM_DATA:
 		// Event holds a file string:

src/include/reb-event.h

@@ -60,6 +60,7 @@ enum {
 	EVF_CONTROL,
 	EVF_SHIFT,
 	EVF_HAS_DATA,   // drop_file event series contains data instead of gob
+	EVF_HAS_CODE,   // XY value is interpreted as integer instead of pair
 };
 
 

src/mezz/prot-http.r

@@ -121,7 +121,7 @@ read-sync-awake: func [event [event!] /local error][
 			true
 		]
 		custom [
-			if all [event/offset event/offset/x = 300][
+			if event/code = 300 [
 				event/port/state/state: 'redirect
 				return true
 			]

src/tests/units/mold-test.r3

@@ -237,7 +237,15 @@ Rebol [
 	;@@ https://github.com/rebol/rebol-issues/issues/2362
 		p: make object! [x: "foo"]
 		e: make event! [type: 'lookup port: p]
-		--assert {make event! [type: 'lookup port: make object! [x: "foo"]]} = mold/flat e
+		--assert (mold/flat e) = {make event! [type: 'lookup port: make object! [x: "foo"]]}
+		e: make event! [type: 'move offset: 10x20]
+		--assert (mold/flat e) = {make event! [type: 'move offset: 10x20]}
+		
+		; only code or offset may be used!
+		e: make event! [type: 'move code: 100 offset: 10x20]
+		--assert (mold/flat e) = {make event! [type: 'move offset: 10x20]}
+		e: make event! [type: 'move offset: 10x20 code: 100]
+		--assert (mold/flat e) = {make event! [type: 'move code: 100]}
 
 ===end-group===
 

src/tests/units/port-test.r3

@@ -79,6 +79,13 @@ Rebol [
 
 ===end-group===
 
+===start-group=== "HTTP scheme"
+	--test-- "read HTTP"
+		--assert  string? try [read http://google.com]
+	--test-- "read HTTPS"
+		--assert  string? try [read https://www.google.com]
+===end-group===
+
 
 if "true" <> get-env "CONTINUOUS_INTEGRATION" [
 	;- don't do these tests on Travis CI