mempool/ckpool
mempool/ckpool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Avoid accessing notify instances outside of the notify lock and avoid leaking memory when we can't match the msgid in proxy_send

Browse Source
This commit is contained in:
Con Kolivas 2014-05-20 15:44:51 +10:00
parent c9f550207f
commit 5b7af2f7ff
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/generator.c
View File

@ -963,9 +963,9 @@ static void *proxy_send(void *arg)
rename_proc("proxysend");
while (42) {
notify_instance_t *instance;
notify_instance_t *ni;
stratum_msg_t *msg;
char *jobid;
char *jobid = NULL;
json_t *val;
uint32_t id;
bool ret;
@ -984,24 +984,23 @@ static void *proxy_send(void *arg)
json_uintcpy(&id, msg->json_msg, "jobid");
mutex_lock(&proxi->notify_lock);
HASH_FIND_INT(proxi->notify_instances, &id, instance);
if (instance)
jobid = strdup(instance->jobid);
HASH_FIND_INT(proxi->notify_instances, &id, ni);
if (ni)
jobid = strdup(ni->jobid);
mutex_unlock(&proxi->notify_lock);
if (!instance) {
if (jobid) {
val = json_pack("{s[ssooo]soss}", "params", proxi->auth, jobid,
json_object_get(msg->json_msg, "nonce2"),
json_object_get(msg->json_msg, "ntime"),
json_object_get(msg->json_msg, "nonce"),
"id", json_object_get(msg->json_msg, "id"),
"method", "mining.submit");
free(jobid);
ret = send_json_msg(cs, val);
json_decref(val);
} else
LOGWARNING("Failed to find matching jobid in proxysend");
continue;
}
val = json_pack("{s[ssooo]soss}", "params", proxi->auth, jobid,
json_object_get(msg->json_msg, "nonce2"),
json_object_get(msg->json_msg, "ntime"),
json_object_get(msg->json_msg, "nonce"),
"id", json_object_get(msg->json_msg, "id"),
"method", "mining.submit");
free(jobid);
ret = send_json_msg(cs, val);
json_decref(val);
json_decref(msg->json_msg);
free(msg);
if (!ret) {