diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index 1de2f1abe678b74dae092b4b51b40a888b68ceb0..c8eb81616454a3078eb768f16b1affd32b81f1d9 100644 (file)
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
data->data.decimal = dbi_result_get_double_idx(res, i);
break;
case SDB_TYPE_STRING:
- data->data.string = dbi_result_get_string_idx(res, i);
+ data->data.string = dbi_result_get_string_copy_idx(res, i);
break;
case SDB_TYPE_DATETIME:
{
case SDB_TYPE_BINARY:
{
size_t length = dbi_result_get_field_length_idx(res, i);
- const unsigned char *datum = dbi_result_get_binary_idx(res, i);
+ unsigned char *datum = dbi_result_get_binary_copy_idx(res, i);
data->data.binary.length = length;
data->data.binary.datum = datum;
}
return -1;
for (n = 0; n < num_rows; ++n) {
+ int status;
+
if (! dbi_result_seek_row(res, n + 1)) {
sdb_log(SDB_LOG_ERR, "dbi: Failed to retrieve row %llu: %s",
n, sdb_dbi_strerror(client->conn));
types[i], &data[i]))
continue;
- if (callback(client, num_fields, data, user_data))
+ status = callback(client, num_fields, data, user_data);
+ for (i = 0; i < num_fields; ++i) {
+ if ((data[i].type == SDB_TYPE_STRING) && (data[i].data.string))
+ free(data[i].data.string);
+ else if ((data[i].type == SDB_TYPE_BINARY)
+ && (data[i].data.binary.datum))
+ free(data[i].data.binary.datum);
+ }
+
+ if (status)
continue;
++success;