fswstat: can't modify automatic variables that get used in waseror() handler

cinap_lenrek committed 8 years ago

Commit fd5ced81 parent aa140ab2 files · +10 −5Browse files

Unified · Split

2 files

 		char *base, *newpath;
 		base = strdup(uif->path);
+		*lastelem(base) = 0;
+		newpath = catpath(base, d.name);
+		free(base);
 		if(waserror()){
-			free(base);
+			free(newpath);
 			nexterror();
 		}
-		*lastelem(base) = 0;
-		newpath = catpath(base, d.name);
-		free(base), base = newpath;
 		if(rename(uif->path, newpath) < 0)
 			error(strerror(errno));
 		free(uif->path);

 			error(Ebadstat);
 		base[l] = 0;
 		newpath = catpath(base, d.name, nil);
-		free(base), base = newpath;
+		free(base);
+		poperror();
+		if(waserror()){
+			free(newpath);
+			nexterror();
+		}
 		if(wcscmp(uif->path, newpath)!=0){
 			if(!MoveFile(uif->path, newpath))
 				oserror();

Keyboard shortcuts