aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2023-02-06 14:55:42 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2023-02-06 14:55:42 +0900
commit584ae66d0fed95773a4164ad666c58c84852361b (patch)
tree3e9a02077237abd1c94a01a01bb99283d171f73e
parentdc550106149e1ac077438354cb6d7d568edede4d (diff)
downloadgnunet-584ae66d0fed95773a4164ad666c58c84852361b.tar.gz
gnunet-584ae66d0fed95773a4164ad666c58c84852361b.zip
Revert "DHT: remove "memory leak" in gnunet-dht-{get,put}."
We cannot free const* here. Need to find another fix if we want to make the sanitizer happy. This reverts commit 0920196347790edf46539eab5ae411745552511e.
-rw-r--r--src/dht/gnunet-dht-get.c26
-rw-r--r--src/dht/gnunet-dht-put.c9
2 files changed, 16 insertions, 19 deletions
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index 4a071dbad..1ae9235f8 100644
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -329,20 +329,18 @@ main (int argc, char *const *argv)
329 GNUNET_STRINGS_get_utf8_args (argc, argv, 329 GNUNET_STRINGS_get_utf8_args (argc, argv,
330 &argc, &argv)) 330 &argc, &argv))
331 return 2; 331 return 2;
332 ret = (GNUNET_OK == 332 return (GNUNET_OK ==
333 GNUNET_PROGRAM_run ( 333 GNUNET_PROGRAM_run (
334 argc, 334 argc,
335 argv, 335 argv,
336 "gnunet-dht-get", 336 "gnunet-dht-get",
337 gettext_noop ( 337 gettext_noop (
338 "Issue a GET request to the GNUnet DHT, prints results."), 338 "Issue a GET request to the GNUnet DHT, prints results."),
339 options, 339 options,
340 &run, 340 &run,
341 NULL)) 341 NULL))
342 ? ret 342 ? ret
343 : 1; 343 : 1;
344 GNUNET_free (argv);
345 return ret;
346} 344}
347 345
348 346
diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index 2281ff56b..531107ef2 100644
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -226,12 +226,13 @@ main (int argc, char *const *argv)
226 GNUNET_GETOPT_OPTION_END 226 GNUNET_GETOPT_OPTION_END
227 }; 227 };
228 228
229
229 if (GNUNET_OK != 230 if (GNUNET_OK !=
230 GNUNET_STRINGS_get_utf8_args (argc, argv, 231 GNUNET_STRINGS_get_utf8_args (argc, argv,
231 &argc, &argv)) 232 &argc, &argv))
232 return 2; 233 return 2;
233 expiration = GNUNET_TIME_UNIT_HOURS; 234 expiration = GNUNET_TIME_UNIT_HOURS;
234 ret = (GNUNET_OK == 235 return (GNUNET_OK ==
235 GNUNET_PROGRAM_run ( 236 GNUNET_PROGRAM_run (
236 argc, 237 argc,
237 argv, 238 argv,
@@ -241,10 +242,8 @@ main (int argc, char *const *argv)
241 options, 242 options,
242 &run, 243 &run,
243 NULL)) 244 NULL))
244 ? ret 245 ? ret
245 : 1; 246 : 1;
246 GNUNET_free (argv);
247 return ret;
248} 247}
249 248
250 249