- diskdrake : Fix a crash with regexp when a /etc/davfs2/secrets line is finished with one or more blank characters without comments

2 files changed, 3 insertions, 1 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0327ffd7c..07fdfe45d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,8 @@
   o never pass username/password as options with davfs2 
   o store credentials in davfs2 secret file before mounting
   o when user does not specify user/pass with davfs2, fallback to nobody/nobody
+  o Fix a crash with regexp when a /etc/davfs2/secrets line is 
+    finished with one or more blank characters without comments
 - adduserdrake
   o now use password weakness display
 - added password weakness display feature in interactive
diff --git a/perl-install/fs/remote/davfs.pm b/perl-install/fs/remote/davfs.pm
index f6571b502..5ba3e84f0 100644
--- a/perl-install/fs/remote/davfs.pm
+++ b/perl-install/fs/remote/davfs.pm
@@ -71,7 +71,7 @@ sub from_double_quoted {
 	if (/^\s*(#.*)?$/) {
 	    $comment = $1;
 	} else {
-            if(/^(?:"((?:\\.|[^"])*)"|((?:\\.|[^"\s#])+))\s+(?:"((?:\\.|[^"])*)"|((?:\\.|[^"\s#])+))(?:\s+(?:"((?:\\.|[^"])*)"|((?:\\.|[^"\s#])+)))?(?:\s*(#.*))?$/) {
+            if(/^(?:"((?:\\.|[^"])*)"|((?:\\.|[^"\s#])+))\s+(?:"((?:\\.|[^"])*)"|((?:\\.|[^"\s#])+))(?:\s+(?:"((?:\\.|[^"])*)"|((?:\\.|[^"\s#])+)))?(?:\s*|\s*(#.*))?$/) {
 	            $mnt = "$1$2";
 		    $mnt =~ s/\\(.)/$1/g;
 		    $user = "$3$4";