[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/security/pwmanager/pwmanager/libpwmanager/lowlevel
From:       Michael Buesch <mbuesch () freenet ! de>
Date:       2006-06-07 20:34:36
Message-ID: 1149712476.134861.12276.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 549229 by mbuesch:

fix false assert.


 M  +10 -9     datafile.cpp  


--- trunk/extragear/security/pwmanager/pwmanager/libpwmanager/lowlevel/datafile.cpp #549228:549229
@@ -420,15 +420,16 @@
 out_close:
 	f.close();
 out_moveback:
-	PWM_ASSERT(!saveName.isEmpty());
-	if (ret) {
-		if (unlink(saveName.ascii()))
-			WARN();
-	} else {
-		if (unlink(origName.ascii()))
-			WARN();
-		if (rename(saveName.ascii(), origName.ascii()))
-			WARN();
+	if (!saveName.isEmpty()) {
+		if (ret) {
+			if (unlink(saveName.ascii()))
+				WARN();
+		} else {
+			if (unlink(origName.ascii()))
+				WARN();
+			if (rename(saveName.ascii(), origName.ascii()))
+				WARN();
+		}
 	}
 out:
 	return ret;
[prev in list] [next in list] [prev in thread] [next in thread]