Changeset 56540 in webkit

Timestamp:

Mar 25, 2010 7:13:56 AM (14 years ago)

Author:

jchaffraix@webkit.org

Message:

commit-log-editor can call itself in an infinite loop
​https://bugs.webkit.org/show_bug.cgi?id=35291

Reviewed by Kenneth Rohde Christiansen.

if $editor ends up being commit-log-editor, the script will exec itself
in an infinite loop.

To avoid this, we now check that the $editor variable is not
commit-log-editor to avoid this case.

• Scripts/commit-log-editor: Added an isCommitLogEditor method and

reworked the $editor setting to add this check.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/commit-log-editor (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-25  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        commit-log-editor can call itself in an infinite loop
+        https://bugs.webkit.org/show_bug.cgi?id=35291
+
+        if $editor ends up being commit-log-editor, the script will exec itself
+        in an infinite loop.
+
+        To avoid this, we now check that the $editor variable is not
+        commit-log-editor to avoid this case.
+
+        * Scripts/commit-log-editor: Added an isCommitLogEditor method and
+        reworked the $editor setting to add this check.
+
 2010-03-25  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebKitTools/Scripts/commit-log-editor

@@ -41 +41 @@
 sub normalizeLineEndings($$);
 sub removeLongestCommonPrefixEndingInDoubleNewline(\%);
+sub isCommitLogEditor($);
 
 sub usage
@@ -62 +63 @@
 
 my $editor = $ENV{SVN_LOG_EDITOR};
-if (!$editor) {
+if (!$editor || isCommitLogEditor($editor)) {
     $editor = $ENV{CVS_LOG_EDITOR};
 }
-if (!$editor) {
+if (!$editor || isCommitLogEditor($editor)) {
     my $builtEditorApplication = "$baseDir/Release/Commit Log Editor.app/Contents/MacOS/Commit Log Editor";
     $editor = $builtEditorApplication if -x $builtEditorApplication;
 }
-if (!$editor) {
+if (!$editor || isCommitLogEditor($editor)) {
     my $builtEditorApplication = "$baseDir/Debug/Commit Log Editor.app/Contents/MacOS/Commit Log Editor";
     $editor = $builtEditorApplication if -x $builtEditorApplication;
 }
-if (!$editor) {
+if (!$editor || isCommitLogEditor($editor)) {
     my $installedEditorApplication = "$ENV{HOME}/Applications/Commit Log Editor.app/Contents/MacOS/Commit Log Editor";
     $editor = $installedEditorApplication if -x $installedEditorApplication;
 }
-if (!$editor) {
-    $editor = $ENV{EDITOR} || "/usr/bin/vi";
+if (!$editor || isCommitLogEditor($editor)) {
+    $editor = $ENV{EDITOR};
+}
+if (!$editor || isCommitLogEditor($editor)) {
+    $editor = "/usr/bin/vi";
 }
 
@@ -308 +312 @@
     return substr($prefix, 0, $lastDoubleNewline + 2);
 }
+
+sub isCommitLogEditor($)
+{
+    my $editor = shift;
+    printf $editor . "\n";
+    return $editor =~ m/commit-log-editor/;
+}