Merge pull request #31 from mgdm/fix-miss-free

Attempt to fix a warning on Travis-CI
mgdm · Sep 2, 2015 · f7deb70 · f7deb70
2 parents c1fd3ea + 6aae69f
commit f7deb70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mosquitto.c b/mosquitto.c
@@ -117,7 +117,11 @@ PHP_METHOD(Mosquitto_Client, __construct)
  if (!object->client) {
  char *message = php_mosquitto_strerror_wrapper(errno);
  zend_throw_exception(mosquitto_ce_exception, message, 1 TSRMLS_CC);
- efree(message);
+#ifndef STRERROR_R_CHAR_P
+ if (message != NULL) {
+ efree(message);
+ }
+#endif
  }
 }
 /* }}} */
@@ -835,10 +839,11 @@ static int strerror_r(int errnum, char *buf, size_t buf_len)
 
 PHP_MOSQUITTO_API char *php_mosquitto_strerror_wrapper(int err)
 {
- char *buf = ecalloc(256, sizeof(char));
+ char *buf;
 #ifdef STRERROR_R_CHAR_P
  return strerror_r(err, buf, 256);
 #else
+ buf = ecalloc(256, sizeof(char));
  if (!strerror_r(err, buf, 256)) {
  return buf;
  }

diff --git a/travis/run-tests.sh b/travis/run-tests.sh
@@ -9,4 +9,4 @@ cd tests
 mosquitto -c mosquitto.conf -d
 cd ..
 
-REPORT_EXIT_STATUS=1 TEST_PHP_ARGS="-q --show-diff" make test
+USE_ZEND_ALLOC=1 REPORT_EXIT_STATUS=1 TEST_PHP_ARGS="-q --show-diff" make test