Browse Source

Merge branch 'bugfix_leak_deciphail' into bfgminer

Luke Dashjr 13 years ago
parent
commit
b4ed6d0028
1 changed files with 2 additions and 1 deletions
  1. 2 1
      miner.c

+ 2 - 1
miner.c

@@ -5565,7 +5565,6 @@ retry_stratum:
 			goto badwork;
 			goto badwork;
 
 
 		rc = work_decode(res, work);
 		rc = work_decode(res, work);
-		json_decref(val);
 		if (rc) {
 		if (rc) {
 			applog(LOG_DEBUG, "Successfully retrieved and deciphered work from pool %u %s",
 			applog(LOG_DEBUG, "Successfully retrieved and deciphered work from pool %u %s",
 			       pool->pool_no, pool->rpc_url);
 			       pool->pool_no, pool->rpc_url);
@@ -5584,6 +5583,7 @@ retry_stratum:
 			gettimeofday(&pool->tv_idle, NULL);
 			gettimeofday(&pool->tv_idle, NULL);
 		} else {
 		} else {
 badwork:
 badwork:
+			json_decref(val);
 			applog(LOG_DEBUG, "Successfully retrieved but FAILED to decipher work from pool %u %s",
 			applog(LOG_DEBUG, "Successfully retrieved but FAILED to decipher work from pool %u %s",
 			       pool->pool_no, pool->rpc_url);
 			       pool->pool_no, pool->rpc_url);
 			if (PLP_NONE != (proto = pool_protocol_fallback(proto)))
 			if (PLP_NONE != (proto = pool_protocol_fallback(proto)))
@@ -5591,6 +5591,7 @@ badwork:
 			free_work(work);
 			free_work(work);
 			goto out;
 			goto out;
 		}
 		}
+		json_decref(val);
 
 
 		if (proto != pool->proto) {
 		if (proto != pool->proto) {
 			pool->proto = proto;
 			pool->proto = proto;