[Commits] 41cfdc8: Add error handling on realpath() call.

Kristian Nielsen knielsen at knielsen-hq.org
Mon Feb 23 14:37:15 EET 2015


revision-id: 41cfdc838e551958b3b1e3a76f1e91040a628786
parent(s): f2cb45daf31087226632719e42a7ec66d8328e15
committer: Kristian Nielsen
branch nick: server
timestamp: 2015-02-23 13:36:52 +0100
message:

Add error handling on realpath() call.

(Without this, it happened for me that realpath() failed returning
undef for the default vardir. This in turn caused mysql-test-run.pl to
delete the source mysql-test/ directory.)

Backport from 10.1, it's not nice to get one's source directory nuked
by a rouge mysql-test-run.

---
 mysql-test/mysql-test-run.pl |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ae037c2..d989479 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1502,7 +1502,12 @@ sub command_line_setup {
   {
     $default_vardir= "$glob_mysql_test_dir/var";
   }
-  $default_vardir = realpath $default_vardir unless IS_WINDOWS;
+  unless (IS_WINDOWS) {
+    my $realpath = realpath($default_vardir);
+    die "realpath('$default_vardir') failed: $!\n"
+      unless defined($realpath) && $realpath ne '';
+    $default_vardir = $realpath;
+  }
 
   if ( ! $opt_vardir )
   {


More information about the commits mailing list