Don't crash if path passed to tr-create doesn't exist

transmission · Jan 24, 2018 · 4b6529d · 4b6529d
1 parent 3106675
commit 4b6529d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c
@@ -134,10 +134,18 @@ static int builderFileCompare(void const* va, void const* vb)
 
 tr_metainfo_builder* tr_metaInfoBuilderCreate(char const* topFileArg)
 {
+    char* const real_top = tr_sys_path_resolve(topFileArg, NULL);
+
+    if (real_top == NULL)
+    {
+        /* TODO: Better error reporting */
+        return NULL;
+    }
+
     struct FileList* files;
     tr_metainfo_builder* ret = tr_new0(tr_metainfo_builder, 1);
 
-    ret->top = tr_sys_path_resolve(topFileArg, NULL);
+    ret->top = real_top;
 
     {
         tr_sys_path_info info;

diff --git a/utils/create.c b/utils/create.c
@@ -192,6 +192,12 @@ int tr_main(int argc, char* argv[])
 
     b = tr_metaInfoBuilderCreate(infile);
 
+    if (b == NULL)
+    {
+        fprintf(stderr, "ERROR: Cannot find specified input file or directory.\n");
+        return EXIT_FAILURE;
+    }
+
     if (piecesize_kib != 0)
     {
         tr_metaInfoBuilderSetPieceSize(b, piecesize_kib * KiB);