diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-05-15 18:46:35 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-05-15 18:46:35 +0200 |
commit | 168e501991b9506b588e1180527dad9c9662ae0c (patch) | |
tree | d97f3376663571e297a2ef81ddc7d32a37cbfd77 | |
parent | 60635a4887062fbcea6b5a8635a73bdadc20d5bc (diff) | |
download | gnunet-168e501991b9506b588e1180527dad9c9662ae0c.tar.gz gnunet-168e501991b9506b588e1180527dad9c9662ae0c.zip |
-coverity: use after free
-rw-r--r-- | src/datacache/plugin_datacache_sqlite.c | 3 | ||||
-rw-r--r-- | src/datastore/datastore_api.c | 2 | ||||
-rw-r--r-- | src/datastore/gnunet-service-datastore.c | 6 | ||||
-rw-r--r-- | src/datastore/plugin_datastore_sqlite.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index a7da6b068..bade15479 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c | |||
@@ -764,7 +764,8 @@ libgnunet_plugin_datacache_sqlite_done (void *cls) | |||
764 | #if ! WINDOWS || defined(__CYGWIN__) | 764 | #if ! WINDOWS || defined(__CYGWIN__) |
765 | if ((NULL != plugin->fn) && (0 != unlink (plugin->fn))) | 765 | if ((NULL != plugin->fn) && (0 != unlink (plugin->fn))) |
766 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", plugin->fn); | 766 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", plugin->fn); |
767 | GNUNET_free (plugin->fn); | 767 | if (NULL != plugin->fn) |
768 | GNUNET_free (plugin->fn); | ||
768 | #endif | 769 | #endif |
769 | sqlite3_finalize (plugin->insert_stmt); | 770 | sqlite3_finalize (plugin->insert_stmt); |
770 | sqlite3_finalize (plugin->get_count_stmt); | 771 | sqlite3_finalize (plugin->get_count_stmt); |
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c index d658b9c85..cb21c9308 100644 --- a/src/datastore/datastore_api.c +++ b/src/datastore/datastore_api.c | |||
@@ -1430,7 +1430,7 @@ GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h, | |||
1430 | { | 1430 | { |
1431 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1431 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1432 | "Could not queue request for `%s'\n", | 1432 | "Could not queue request for `%s'\n", |
1433 | GNUNET_h2s (key)); | 1433 | (NULL == key) ? "NULL" : GNUNET_h2s (key)); |
1434 | return NULL; | 1434 | return NULL; |
1435 | } | 1435 | } |
1436 | #if INSANE_STATISTICS | 1436 | #if INSANE_STATISTICS |
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 97888ce03..7d07ba3b3 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c | |||
@@ -1556,7 +1556,8 @@ run (void *cls, | |||
1556 | 5); /* approx. 3% false positives at max use */ | 1556 | 5); /* approx. 3% false positives at max use */ |
1557 | refresh_bf = GNUNET_YES; | 1557 | refresh_bf = GNUNET_YES; |
1558 | } | 1558 | } |
1559 | GNUNET_free (pfn); | 1559 | if (NULL != pfn) |
1560 | GNUNET_free (pfn); | ||
1560 | } | 1561 | } |
1561 | else | 1562 | else |
1562 | { | 1563 | { |
@@ -1566,7 +1567,8 @@ run (void *cls, | |||
1566 | 5); /* approx. 3% false positives at max use */ | 1567 | 5); /* approx. 3% false positives at max use */ |
1567 | refresh_bf = GNUNET_YES; | 1568 | refresh_bf = GNUNET_YES; |
1568 | } | 1569 | } |
1569 | GNUNET_free (fn); | 1570 | if (NULL != fn) |
1571 | GNUNET_free (fn); | ||
1570 | if (NULL == filter) | 1572 | if (NULL == filter) |
1571 | { | 1573 | { |
1572 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1574 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index f58955b7b..40f955312 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c | |||
@@ -729,7 +729,8 @@ sqlite_plugin_put (void *cls, | |||
729 | } | 729 | } |
730 | GNUNET_SQ_reset (plugin->dbh, stmt); | 730 | GNUNET_SQ_reset (plugin->dbh, stmt); |
731 | cont (cont_cls, key, size, ret, msg); | 731 | cont (cont_cls, key, size, ret, msg); |
732 | GNUNET_free (msg); | 732 | if (NULL != msg) |
733 | GNUNET_free (msg); | ||
733 | } | 734 | } |
734 | 735 | ||
735 | 736 | ||