Explorar o código

v.edit: fix segfault when no input is defined

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48026 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa %!s(int64=13) %!d(string=hai) anos
pai
achega
771bdc72da
Modificáronse 1 ficheiros con 7 adicións e 7 borrados
  1. 7 7
      vector/v.edit/main.c

+ 7 - 7
vector/v.edit/main.c

@@ -69,18 +69,18 @@ int main(int argc, char *argv[])
     }
 
     /* open input file */
-    if (strcmp(params.in->answer, "-") == 0 ||
-	(action_mode != MODE_CREATE && params.in->answer == NULL)) {
-	ascii = stdin;
-    }
-    else if (params.in->answer) {
+    if (params.in->answer &&
+	strcmp(params.in->answer, "-") != 0) {
 	ascii = fopen(params.in->answer, "r");
 	if (ascii == NULL) {
-	    G_fatal_error(_("Unable to open ASCII file <%s>"),
+	    G_fatal_error(_("Unable to open file <%s>"),
 			  params.in->answer);
 	}
     }
-
+    else if (action_mode != MODE_CREATE) {
+	ascii = stdin;
+    }
+    
     if (action_mode == MODE_CREATE) {
 	int overwrite;