* Check for ISO-8859-1/UTF-8 on strings to prevent binary data corruption

Author: chrisbckr

Makefile.frag

@@ -12,3 +12,5 @@ endif
 ifneq (,$(realpath $(EXTENSION_DIR)/dom.so))
 PHP_TEST_SHARED_EXTENSIONS+=-d extension=$(EXTENSION_DIR)/dom.so
 endif
+
+PHP_TEST_SHARED_EXTENSIONS+=-d extension=$(EXTENSION_DIR)/mbstring.so

v8js_convert.cc

@@ -113,7 +113,7 @@ v8::Local<v8::Value> zval_to_v8js(zval *value, v8::Isolate *isolate) /* {{{ */
 	v8::Local<v8::Value> jsValue;
 	zend_string *value_str;
 	zend_class_entry *ce;
-
+	
 	switch (Z_TYPE_P(value))
 	{
 		case IS_INDIRECT:
@@ -150,7 +150,20 @@ v8::Local<v8::Value> zval_to_v8js(zval *value, v8::Isolate *isolate) /* {{{ */
 				break;
 			}
 
-			jsValue = V8JS_ZSTR(value_str);
+			zval fname, retval;
+			zval params[2];
+			ZVAL_STRING(&fname, "mb_check_encoding");
+			ZVAL_COPY_VALUE(&params[0], value);
+			ZVAL_STRING(&params[1], "UTF-8");
+
+			if ((SUCCESS == call_user_function(CG(function_table), NULL, &fname,
+									&retval, 2, params)) && (Z_TYPE(retval) == IS_TRUE)) {
+				jsValue = V8JS_ZSTR(value_str);
+			}
+			else {
+				jsValue = v8::String::NewFromOneByte(isolate, (unsigned char *)ZSTR_VAL(value_str), v8::NewStringType::kNormal, ZSTR_LEN(value_str)).ToLocalChecked();
+			}
+			
 			break;
 
 		case IS_LONG:
@@ -191,9 +204,19 @@ int v8js_to_zval(v8::Local<v8::Value> jsValue, zval *return_value, int flags, v8
 
 	if (jsValue->IsString())
 	{
-		v8::String::Utf8Value str(isolate, jsValue);
-		const char *cstr = ToCString(str);
-		RETVAL_STRINGL(cstr, str.length());
+		v8::Local<v8::String> strOneByte = jsValue->ToString(v8_context).ToLocalChecked();
+		if (strOneByte->IsOneByte() && strOneByte->ContainsOnlyOneByte()) {
+			int length = strOneByte->Length();
+			char* char_value = new char[length + 1];
+			strOneByte->WriteOneByte(isolate, reinterpret_cast<uint8_t*>(&char_value[0]), 0, length);
+
+			RETVAL_STRINGL(char_value, length);
+		}
+		else {
+			v8::String::Utf8Value str(isolate, jsValue);
+			const char *cstr = ToCString(str);
+			RETVAL_STRINGL(cstr, str.length());
+		}
 	}
 	else if (jsValue->IsBoolean())
 	{