Browse Source

Revert "Allow add_msg_entry to be called with a null buffer safely"

This reverts commit 5cc1812271.
master
Con Kolivas 9 years ago
parent
commit
f42f187529
  1. 10
      src/stratifier.c

10
src/stratifier.c

@ -454,11 +454,8 @@ struct json_entry {
* to the log outside of lock */ * to the log outside of lock */
static void add_msg_entry(char_entry_t **entries, char **buf) static void add_msg_entry(char_entry_t **entries, char **buf)
{ {
char_entry_t *entry; char_entry_t *entry = ckalloc(sizeof(char_entry_t));
if (!*buf)
return;
entry = ckalloc(sizeof(char_entry_t));
entry->buf = *buf; entry->buf = *buf;
*buf = NULL; *buf = NULL;
DL_APPEND(*entries, entry); DL_APPEND(*entries, entry);
@ -1340,7 +1337,10 @@ static void _dec_instance_ref(sdata_t *sdata, stratum_instance_t *client, const
* moved due to holding a reference and drop them now. */ * moved due to holding a reference and drop them now. */
if (unlikely(client->dropped && !ref)) { if (unlikely(client->dropped && !ref)) {
__drop_client(sdata, client, true, &msg); __drop_client(sdata, client, true, &msg);
add_msg_entry(&entries, &msg); /* Make sure there is a message as throttled users don't
* generate a message */
if (msg)
add_msg_entry(&entries, &msg);
} }
ck_wunlock(&sdata->instance_lock); ck_wunlock(&sdata->instance_lock);

Loading…
Cancel
Save