util.c: Decreasing reference count on allocated JSON obects to prevent memory leak
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
diff --git a/util.c b/util.c
index f5472c3..4e3d502 100644
--- a/util.c
+++ b/util.c
@@ -1738,8 +1738,10 @@ bool parse_method(struct pool *pool, char *s)
}
method = json_object_get(val, "method");
- if (!method)
+ if (!method) {
+ json_decref(val);
return ret;
+ }
err_val = json_object_get(val, "error");
params = json_object_get(val, "params");
@@ -1753,42 +1755,51 @@ bool parse_method(struct pool *pool, char *s)
applog(LOG_INFO, "JSON-RPC method decode failed: %s", ss);
+ json_decref(val);
free(ss);
return ret;
}
buf = (char *)json_string_value(method);
- if (!buf)
+ if (!buf) {
+ json_decref(val);
return ret;
+ }
if (!strncasecmp(buf, "mining.notify", 13)) {
if (parse_notify(pool, params))
pool->stratum_notify = ret = true;
else
pool->stratum_notify = ret = false;
+ json_decref(val);
return ret;
}
if (!strncasecmp(buf, "mining.set_difficulty", 21) && parse_diff(pool, params)) {
ret = true;
+ json_decref(val);
return ret;
}
if (!strncasecmp(buf, "client.reconnect", 16) && parse_reconnect(pool, params)) {
ret = true;
+ json_decref(val);
return ret;
}
if (!strncasecmp(buf, "client.get_version", 18) && send_version(pool, val)) {
ret = true;
+ json_decref(val);
return ret;
}
if (!strncasecmp(buf, "client.show_message", 19) && show_message(pool, params)) {
ret = true;
+ json_decref(val);
return ret;
}
+ json_decref(val);
return ret;
}
@@ -1831,13 +1842,16 @@ bool auth_stratum(struct pool *pool)
applog(LOG_WARNING, "pool %d JSON stratum auth failed: %s", pool->pool_no, ss);
free(ss);
- return ret;
+ goto out;
}
ret = true;
applog(LOG_INFO, "Stratum authorisation success for pool %d", pool->pool_no);
pool->probed = true;
successful_connect = true;
+
+out:
+ json_decref(val);
return ret;
}
@@ -2383,6 +2397,7 @@ out:
applog(LOG_DEBUG, "Failed to resume stratum, trying afresh");
noresume = true;
+ json_decref(val);
goto resend;
}
applog(LOG_DEBUG, "Initiate stratum failed");
@@ -2390,6 +2405,7 @@ out:
suspend_stratum(pool);
}
+ json_decref(val);
return ret;
}