Browse Source

Merge branch 'bugfix_free_rpc_req' into bfgminer

Conflicts:
	miner.c
Luke Dashjr 13 years ago
parent
commit
3d38b92390
2 changed files with 3 additions and 3 deletions
  1. 1 1
      libblkmaker
  2. 2 2
      miner.c

+ 1 - 1
libblkmaker

@@ -1 +1 @@
-Subproject commit fde65d1bc043a13292986c2cab9c3cd01e50735e
+Subproject commit e0b627c6522fdbd7c65f883a2c76e3aa437ce910

+ 2 - 2
miner.c

@@ -5615,8 +5615,6 @@ retry_pool:
 		if (!rpc_req)
 			goto lpfail;
 
-		free(rpc_req);
-
 		wait_lpcurrent(cp);
 
 		gettimeofday(&start, NULL);
@@ -5634,6 +5632,8 @@ retry_pool:
 
 		gettimeofday(&reply, NULL);
 
+		free(rpc_req);
+
 		if (likely(val)) {
 			soval = json_object_get(json_object_get(val, "result"), "submitold");
 			if (soval)