From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 28 Jan 2025 01:07:16 +0000 (+0100)
Subject: tty-ask-password-agent: use free_and_strdup_warn() for arg_device
X-Git-Tag: v258-rc1~1467^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce8199a164559426c6be92cc84b18f850ee6d2c9;p=thirdparty%2Fsystemd.git

tty-ask-password-agent: use free_and_strdup_warn() for arg_device

Follow-up for 68cf1fc34d3e86a664fb948d413e1db4a24e16dd

Fixes CID#1590840
---

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 26c135a45f3..6950a8697ee 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -495,7 +495,7 @@ static int parse_argv(int argc, char *argv[]) {
                 {}
         };
 
-        int c;
+        int r, c;
 
         assert(argc >= 0);
         assert(argv);
@@ -537,9 +537,9 @@ static int parse_argv(int argc, char *argv[]) {
                                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                                "Empty console device path is not allowed.");
 
-                                arg_device = strdup(optarg);
-                                if (!arg_device)
-                                        return log_oom();
+                                r = free_and_strdup_warn(&arg_device, optarg);
+                                if (r < 0)
+                                        return r;
                         }
                         break;