diff --git a/lib/formdata.c b/lib/formdata.c
index 798303d3a..affaf4b6d 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -944,9 +944,10 @@ char *basename(char *path)
   if(s1 && s2) {
     path = (s1 > s2? s1 : s2)+1;
   }
-  else {
-    path = (s1 ? s1 : s2)+1;
-  }
+  else if(s1)
+    path = s1 + 1;
+  else if(s2)
+    path = s1 + 1;
 
   return path;
 }