]> source.dussan.org Git - rspamd.git/commitdiff
* Fix double free of memory
authorVsevolod Stakhov <vsevolod@rambler-co.ru>
Wed, 16 Sep 2009 12:16:50 +0000 (16:16 +0400)
committerVsevolod Stakhov <vsevolod@rambler-co.ru>
Wed, 16 Sep 2009 12:16:50 +0000 (16:16 +0400)
* Fix symbols output

src/lua/lua_task.c
src/protocol.c

index 844229f9d93d7af635b958d2a6a7b6c3331d4d58..082b1690f274ea83bf4a99c8fc506253dc389d06 100644 (file)
@@ -122,9 +122,6 @@ lua_task_insert_result (lua_State *L)
                }
 
                insert_result (task, metric_name, symbol_name, flag, params);
-               if (params != NULL) {
-                       memory_pool_add_destructor (task->task_pool, (pool_destruct_func)g_list_free, params);
-               }
        }
        return 1;
 }
index cd5f32424a3475e265ad6dcb8b62054916b325ae..d6fe07cca59abe84fdb14e50523daf51761357e7 100644 (file)
@@ -454,7 +454,9 @@ metric_symbols_callback (gpointer key, gpointer value, void *user_data)
                        outbuf[OUTBUFSIZ - 1] = '\n';
                }
        }
-       r = snprintf (outbuf, OUTBUFSIZ, "Symbol: %s" CRLF, (char *)key);
+       else {
+               r = snprintf (outbuf, OUTBUFSIZ, "Symbol: %s" CRLF, (char *)key);
+       }
        cd->log_offset += snprintf (cd->log_buf + cd->log_offset, cd->log_size - cd->log_offset,
                                                "%s,", (char *)key);