Merge branch 'release/v0.3.1'

Author: sonicdoe

README.md

@@ -77,6 +77,9 @@ As listed in [ICU’s user guide](http://userguide.icu-project.org/conversion/de
 
 ## Release history
 
+- v0.3.1 (2017-03-10):
+  - Fix continuing execution even after an error occurred.
+  - Fix memory leak by properly closing ICU’s charset detector.
 - v0.3.0 (2017-01-28): Add support for Node.js v6 and v7 and
   drop support for Node.js v0.10 and v0.12.
 - v0.2.1 (2015-12-28): Republish because v0.2.0 didn’t include `config.gypi`.

icuWrapper.cpp

@@ -16,6 +16,7 @@ NAN_METHOD(DetectCharacterEncoding) {
 
 	if(U_FAILURE(errorCode)) {
 		Nan::ThrowError("Failed to open ICU charset detector.");
+		return;
 	}
 
 	ucsdet_setText(
@@ -27,31 +28,40 @@ NAN_METHOD(DetectCharacterEncoding) {
 
 	if(U_FAILURE(errorCode)) {
 		Nan::ThrowError("Failed to set ICU charset detector’s text.");
+		ucsdet_close(charsetDetector);
+		return;
 	}
 
 	charsetMatch = ucsdet_detect(charsetDetector, &errorCode);
 
 	if(U_FAILURE(errorCode)) {
 		Nan::ThrowError("Failed to detect charset.");
+		ucsdet_close(charsetDetector);
+		return;
 	}
 
 	const char *charsetName = ucsdet_getName(charsetMatch, &errorCode);
 
 	if(U_FAILURE(errorCode)) {
 		Nan::ThrowError("Failed to get name from charset match.");
+		ucsdet_close(charsetDetector);
+		return;
 	}
 
 	int32_t confidence = ucsdet_getConfidence(charsetMatch, &errorCode);
 
 	if(U_FAILURE(errorCode)) {
 		Nan::ThrowError("Failed to get confidence from charset match.");
+		ucsdet_close(charsetDetector);
+		return;
 	}
 
 	v8::Local<v8::Object> obj = Nan::New<v8::Object>();
 	obj->Set(Nan::New<v8::String>("encoding").ToLocalChecked(), Nan::New<v8::String>(charsetName).ToLocalChecked());
 	obj->Set(Nan::New<v8::String>("confidence").ToLocalChecked(), Nan::New<v8::Number>(confidence));
 
 	info.GetReturnValue().Set(obj);
+	ucsdet_close(charsetDetector);
 }
 
 void Init(v8::Local<v8::Object> exports) {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "detect-character-encoding",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"author": "Jakob Krigovsky <[email protected]>",
 	"description": "Detect character encoding using ICU.",
 	"repository": {