Merge pull request #69 from foodtiny/task/fix-memory-leak

Use valgrind to verify unit test and check memory every commit

Author: Food Tiny

.gitignore

@@ -1,6 +1,7 @@
 # git rm --cached `git ls-files -i --exclude-from=.gitignore`
 .DS_Store
 bin
+a.out
 /.idea
 /CMakeFiles
 /cmake-build-debug
@@ -23,4 +24,4 @@ bin
 /test.txt
 /logging
 /json
-/native.iml
+/native.iml

.travis.yml

@@ -14,10 +14,8 @@ before_script:
 - cmake . -DCMAKE_BUILD_TYPE=debug -DCMAKE_VERBOSE_MAKEFILE=true
 script:
 - make native_test -j8
-- make unit-test
+- ./misc/memory_check
 after_script:
 - sudo pkill python
-after_success:
-- ./misc/memory_check
 notifications:
   slack: foodtiny:hzkLBCLrqjtgi9ctqwdQ034S

java/lang/Object/Object.hpp

@@ -106,7 +106,7 @@ class Array  {
 		string result = strdup("");
 		if (std::is_same<E, byte>::value || std::is_same<E, char>::value) {
 			for (char element : *this) {
-				char *result_holder = result;
+				string result_holder = result;
 				result = string_append(&result, element);
 				free(result_holder);
 			}

java/lang/String/String.cpp

@@ -36,7 +36,7 @@ String::String() {
 
 String::String(const_string target) {
 	this->original = strdup(target);
-	this->size = length_pointer_char((char *) target);
+	this->size = length_pointer_char((string) target);
 }
 
 String::String(string target) {
@@ -74,9 +74,9 @@ String::~String() {
  * @return String
  */
 String String::clone() {
-	string holdPointer = strdup(this->original);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = strdup(this->original);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -125,7 +125,7 @@ int String::compareToIgnoreCase(String str) const {
  * @return String
  */
 String String::concat(String str) {
-	char *stringConcat = string_concat(this->original, str.original);
+	string stringConcat = string_concat(this->original, str.original);
 	String result(stringConcat);
 	free(stringConcat);
 	return result;
@@ -193,9 +193,9 @@ String String::fromCharArray(Array<char> &chars) {
  * @return int
  */
 int String::indexOf(int ch) const {
-	string holdPointer = string_from_char((char) ch);
-	int result = string_index(this->original, holdPointer, 1);
-	free(holdPointer);
+	string pointerHolder = string_from_char((char) ch);
+	int result = string_index(this->original, pointerHolder, 1);
+	free(pointerHolder);
 	return result;
 }
 
@@ -377,9 +377,9 @@ boolean String::matches(String regex) const {
 String String::replace(char oldChar, char newChar) const {
 	string oldString = string_from_char(oldChar);
 	string newString = string_from_char(newChar);
-	string holdPointer = string_replace(this->original, oldString, newString);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_replace(this->original, oldString, newString);
+	String result = pointerHolder;
+	free(pointerHolder);
 	free(oldString);
 	free(newString);
 	return result;
@@ -404,7 +404,7 @@ String String::replaceAll(String regex, String replacement) const {
  * @return Array<String>
  */
 Array<String> String::split(String regex) const {
-	char **splitStrings = string_split(this->original, regex.toString());
+	string *splitStrings = string_split(this->original, regex.toString());
 	Array<String> strings;
 
 #ifdef __linux__
@@ -548,9 +548,9 @@ String String::valueOf(boolean target) {
  * @return String
  */
 String String::valueOf(char target) {
-	string holdPointer = string_from_char(target);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_from_char(target);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -574,9 +574,9 @@ String String::valueOf(string target) {
  * @return String
  */
 String String::valueOf(short target) {
-	string holdPointer = string_from_short(target);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_from_short(target);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -587,9 +587,9 @@ String String::valueOf(short target) {
  * @return String
  */
 String String::valueOf(int target) {
-	string holdPointer = string_from_int(target);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_from_int(target);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -600,9 +600,9 @@ String String::valueOf(int target) {
  * @return String
  */
 String String::valueOf(long target) {
-	string holdPointer = string_from_long(target);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_from_long(target);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -613,9 +613,9 @@ String String::valueOf(long target) {
  * @return String
  */
 String String::valueOf(float target) {
-	string holdPointer = string_from_float(target);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_from_float(target);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -626,9 +626,9 @@ String String::valueOf(float target) {
  * @return String
  */
 String String::valueOf(double target) {
-	string holdPointer = string_from_double(target);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_from_double(target);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -639,9 +639,9 @@ String String::valueOf(double target) {
  * @return String
  */
 String String::operator+(const string &target) {
-	string holdPointer = string_concat(this->original, target);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_concat(this->original, target);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -652,9 +652,9 @@ String String::operator+(const string &target) {
  * @return String
  */
 String String::operator+(const String &target) {
-	string holdPointer = string_concat(this->original, target.original);
-	String result = holdPointer;
-	free(holdPointer);
+	string pointerHolder = string_concat(this->original, target.original);
+	String result = pointerHolder;
+	free(pointerHolder);
 	return result;
 }
 
@@ -664,16 +664,16 @@ String String::operator+(const String &target) {
  * @param target2
  */
 String String::operator+=(const String &target) {
-	char *result = string_concat(this->original, target.original);
+	string result = string_concat(this->original, target.original);
 	*this = result;
 	free(result);
 	return *this;
 }
 
 String String::operator+=(const char &target) {
-	void* holdPointer = this->original;
+	string pointerHolder = this->original;
 	string_append(&this->original, target);
-	free(holdPointer);
+	free(pointerHolder);
 	return *this;
 }
 

java/lang/System/System.cpp

@@ -29,7 +29,7 @@
 using namespace Java::Lang;
 
 void System::out::print(String target) {
-	char *targetCharacters = target.toString();
+	string targetCharacters = target.toString();
 	if (is_empty(targetCharacters)) {
 		return;
 	}
@@ -38,7 +38,7 @@ void System::out::print(String target) {
 }
 
 void System::out::println(String target) {
-	char *targetCharacters = target.toString();
+	string targetCharacters = target.toString();
 	if (is_empty(targetCharacters)) {
 		return;
 	}

java/net/URLDecoder/URLDecoderTest.cpp

@@ -36,6 +36,6 @@ using namespace Java::Lang;
 TEST(JavaNet, URLDecodeString) {
 //    String target = "Qu%c3%a1n+%c4%83n";
 //    String result = URLDecoder::decode(target);
-//    char *expect = "Quán ăn";
+//    string expect = "Quán ăn";
 //    ASSERT_STR(expect, result.toString());
 }

misc/memory_check

@@ -14,4 +14,6 @@ env | sort
 if [ "$TRAVIS_OS_NAME" != "osx" ]
 then
     valgrind --error-exitcode=42 --leak-check=full ./native_test
+else
+    ./native_test
 fi