]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:torture: Add missing NULL checks in spoolss.c
authorAndreas Schneider <asn@samba.org>
Tue, 30 Apr 2024 15:31:00 +0000 (17:31 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Thu, 13 Jun 2024 12:25:37 +0000 (12:25 +0000)
source4/torture/rpc/spoolss.c: In function
  ‘check_printer_driver_file.isra’:
source4/torture/rpc/spoolss.c:10850:58: error: ‘%s’ directive argument
  is null [-Werror=format-overflow=]
10850 |         const char *remote_name = talloc_asprintf(tctx, "%s\\%d\\%s",
      |                                                          ^~

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source4/torture/rpc/spoolss.c

index 05a0aef7e437a647a1e3b8a1dc15912c6e4ff837..867b94ba65418ec5997bf26412f0dfca46afeb76 100644 (file)
@@ -10846,15 +10846,22 @@ static bool check_printer_driver_file(struct torture_context *tctx,
                                      struct torture_driver_context *d,
                                      const char *file_name)
 {
-       const char *remote_arch_dir = driver_directory_dir(d->remote.driver_directory);
-       const char *remote_name = talloc_asprintf(tctx, "%s\\%d\\%s",
-                                                 remote_arch_dir,
-                                                 d->info8.version,
-                                                 file_name);
+       const char *remote_arch_dir = NULL;
+       const char *remote_name = NULL;
        int fnum;
 
        torture_assert(tctx, (file_name && strlen(file_name) != 0), "invalid filename");
 
+       remote_arch_dir = driver_directory_dir(d->remote.driver_directory);
+       torture_assert_not_null(tctx, remote_arch_dir, "remote_arch_dir is null");
+
+       remote_name = talloc_asprintf(tctx,
+                                     "%s\\%d\\%s",
+                                     remote_arch_dir,
+                                     d->info8.version,
+                                     file_name);
+       torture_assert_not_null(tctx, remote_name, "renote_name is null");
+
        torture_comment(tctx, "checking for driver file at %s\n", remote_name);
 
        fnum = smbcli_open(cli->tree, remote_name, O_RDONLY, DENY_NONE);