Handle potential dirname/basename errors where needed

diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index a271f207c372de565753901c4dbd78fa6f3a06e6..5c4a5eb31d4279cd56dc34717b458228786d42ed 100644 (file)
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -165,7 +165,12 @@ cached_file_open (struct tr_cached_file  * o,
   /* create subfolders, if any */
   if (writable)
     {
-      char * dir = tr_sys_path_dirname (filename, NULL);
+      char * dir = tr_sys_path_dirname (filename, &error);
+      if (dir == NULL)
+        {
+          tr_logAddError (_("Couldn't get directory for \"%1$s\": %2$s"), filename, error->message);
+          goto fail;
+        }
       if (!tr_sys_dir_create (dir, TR_SYS_DIR_CREATE_PARENTS, 0777, &error))
         {
           tr_logAddError (_("Couldn't create \"%1$s\": %2$s"), dir, error->message);

diff --git a/libtransmission/file-test.c b/libtransmission/file-test.c
index 2692a0a0b09f76520f67b77815adf3c07e88a6e9..b98bfade55a8dbc3c01400300dbc58544cbcd051 100644 (file)
--- a/libtransmission/file-test.c
+++ b/libtransmission/file-test.c
@@ -669,6 +669,47 @@ test_path_xname (const struct xname_test_data * data,
 static int
 test_path_basename_dirname (void)
 {
+  const struct xname_test_data common_xname_tests[] =
+  {
+    { "/", "/" },
+    { "", "." },
+#ifdef _WIN32
+    { "\\", "/" },
+    /* Invalid paths */
+    { "\\\\\\", NULL },
+    { "123:" , NULL },
+    /* Reserved characters */
+    { "<", NULL },
+    { ">", NULL },
+    { ":", NULL },
+    { "\"", NULL },
+    { "|", NULL },
+    { "?", NULL },
+    { "*", NULL },
+    { "a\\<", NULL },
+    { "a\\>", NULL },
+    { "a\\:", NULL },
+    { "a\\\"", NULL },
+    { "a\\|", NULL },
+    { "a\\?", NULL },
+    { "a\\*", NULL },
+    { "c:\\a\\b<c\\d", NULL },
+    { "c:\\a\\b>c\\d", NULL },
+    { "c:\\a\\b:c\\d", NULL },
+    { "c:\\a\\b\"c\\d", NULL },
+    { "c:\\a\\b|c\\d", NULL },
+    { "c:\\a\\b?c\\d", NULL },
+    { "c:\\a\\b*c\\d", NULL }
+#else
+    { "////", "/" }
+#endif
+  };
+
+  if (test_path_xname (common_xname_tests, sizeof (common_xname_tests) / sizeof (*common_xname_tests), tr_sys_path_basename) != 0)
+    return 1;
+  if (test_path_xname (common_xname_tests, sizeof (common_xname_tests) / sizeof (*common_xname_tests), tr_sys_path_dirname) != 0)
+    return 1;
+
   const struct xname_test_data basename_tests[] =
   {
     { "a", "a" },
@@ -676,8 +717,6 @@ test_path_basename_dirname (void)
     { "/aa", "aa" },
     { "/a/b/c", "c" },
     { "/a/b/c/", "c" },
-    { "/", "/" },
-    { "", "." },
 #ifdef _WIN32
     { "c:\\a\\b\\c", "c" },
     { "c:", "/" },
@@ -690,13 +729,8 @@ test_path_basename_dirname (void)
     { "//1.2.3.4/b", "b" },
     { "\\\\a", "a" },
     { "\\\\1.2.3.4", "1.2.3.4" },
-    { "\\\\", "/" },
     { "\\", "/" },
-    { "\\a", "a" },
-    { "\\\\\\", NULL },
-    { "123:" , NULL }
-#else
-    { "////", "/" }
+    { "\\a", "a" }
 #endif
   };
 
@@ -710,8 +744,6 @@ test_path_basename_dirname (void)
     { "a/b/c/", "a/b" },
     { "a", "." },
     { "a/", "." },
-    { "/", "/" },
-    { "", "." },
 #ifdef _WIN32
     { "C:\\a/b\\c", "C:\\a/b" },
     { "C:\\a/b\\c\\", "C:\\a/b" },
@@ -730,12 +762,7 @@ test_path_basename_dirname (void)
     { "\\\\a", "\\\\" },
     { "\\\\1.2.3.4", "\\\\" },
     { "\\\\", "\\\\" },
-    { "\\", "/" },
-    { "a/b\\c", "a/b" },
-    { "\\\\\\" , NULL },
-    { "123:" , NULL }
-#else
-    { "////", "/" }
+    { "a/b\\c", "a/b" }
 #endif
   };
 

diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c
index 26f39d0610da0b1c86ae9f6162013b228d67915c..ceb7e5ac7c1dbcd05584c4952e490b0025b5a411 100644 (file)
--- a/libtransmission/makemeta.c
+++ b/libtransmission/makemeta.c
@@ -42,6 +42,9 @@ getFiles (const char      * dir,
           const char      * base,
           struct FileList * list)
 {
+  if (dir == NULL || base == NULL)
+    return NULL;
+
   tr_sys_dir_t odir;
   char * buf;
   tr_sys_path_info info;
@@ -373,8 +376,11 @@ makeInfoDict (tr_variant          * dict,
     }
 
   base = tr_sys_path_basename (builder->top, NULL);
-  tr_variantDictAddStr (dict, TR_KEY_name, base);
-  tr_free (base);
+  if (base != NULL)
+    {
+      tr_variantDictAddStr (dict, TR_KEY_name, base);
+      tr_free (base);
+    }
 
   tr_variantDictAddInt (dict, TR_KEY_piece_length, builder->pieceSize);
 

diff --git a/libtransmission/torrent-ctor.c b/libtransmission/torrent-ctor.c
index 101921280cbb9a0695042f8c249138ed1a6a5435..db8815346dc0069d5a1b84d4c2930022b7aa5147 100644 (file)
--- a/libtransmission/torrent-ctor.c
+++ b/libtransmission/torrent-ctor.c
@@ -159,8 +159,11 @@ tr_ctorSetMetainfoFromFile (tr_ctor *    ctor,
             if (!name || !*name)
             {
                 char * base = tr_sys_path_basename (filename, NULL);
-                tr_variantDictAddStr (info, TR_KEY_name, base);
-                tr_free (base);
+                if (base != NULL)
+                  {
+                    tr_variantDictAddStr (info, TR_KEY_name, base);
+                    tr_free (base);
+                  }
             }
         }
     }

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 54e31509f0b777efa8aae4dfcb8e8312986c894a..dbcaf87bdba8a82a8a029aa5a50ba68a5c01a1b1 100644 (file)
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -3048,6 +3048,9 @@ deleteLocalData (tr_torrent * tor, tr_fileFunc func)
       dir = tr_sys_path_dirname (filename, NULL);
       tr_free (filename);
 
+      if (dir == NULL)
+        continue;
+
       /* walk up the directory tree until we reach 'top' */
       if (!tr_sys_path_is_same (top, dir, NULL) && strcmp (top, dir) != 0)
         {
@@ -3754,6 +3757,9 @@ renameTorrentFileString (tr_torrent       * tor,
     {
       char * tmp = tr_sys_path_dirname (oldpath, NULL);
 
+      if (tmp == NULL)
+        return;
+
       if (oldpath_len >= strlen(file->name))
         name = tr_buildPath (tmp, newname, NULL);
       else

diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index db9a4456f615395291968ea9f3282f6427410d32..bdb5407d9347da62fc40f346062c56aeb5ce0450 100644 (file)
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -1478,8 +1478,8 @@ tr_moveFile (const char * oldpath, const char * newpath, tr_error ** error)
 
   /* make sure the target directory exists */
   {
-    char * newdir = tr_sys_path_dirname (newpath, NULL);
-    const bool i = tr_sys_dir_create (newdir, TR_SYS_DIR_CREATE_PARENTS, 0777, error);
+    char * newdir = tr_sys_path_dirname (newpath, error);
+    const bool i = newdir != NULL && tr_sys_dir_create (newdir, TR_SYS_DIR_CREATE_PARENTS, 0777, error);
     tr_free (newdir);
     if (!i)
       {

diff --git a/utils/create.c b/utils/create.c
index 18d3a145aa36c886fd976769800d66190617f5cd..fd349efbc08c102ac2a5d5cf3b3f51a7ec9e2eca 100644 (file)
--- a/utils/create.c
+++ b/utils/create.c
@@ -156,7 +156,14 @@ tr_main (int    argc,
 
   if (outfile == NULL)
     {
-      char * base = tr_sys_path_basename (infile, NULL);
+      tr_error * error = NULL;
+      char * base = tr_sys_path_basename (infile, &error);
+      if (base == NULL)
+        {
+          fprintf (stderr, "ERROR: Cannot deduce output path from input path: %s\n", error->message);
+          return EXIT_FAILURE;
+        }
+
       char * end = tr_strdup_printf ("%s.torrent", base);
       char * cwd = tr_getcwd ();
       outfile = out2 = tr_buildPath (cwd, end, NULL);