diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2009-12-17 01:17:19 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2009-12-17 01:17:19 +0300 |
| commit | ac7a364349f2d540612c9ee0ad0931e975da9a93 (patch) | |
| tree | 457f378085952492a75128652ed544200027bcd9 /mcs/tools | |
| parent | b89381270153f4c1315a477afa813b27bd068692 (diff) | |
2009-12-16 Miguel de Icaza <miguel@novell.com>
* repl.cs: Avoid crash, fixes 554898
svn path=/branches/mono-2-6/mcs/; revision=148598
Diffstat (limited to 'mcs/tools')
| -rw-r--r-- | mcs/tools/csharp/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/tools/csharp/repl.cs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mcs/tools/csharp/ChangeLog b/mcs/tools/csharp/ChangeLog index ec69e64cac3..f3d78bbdeb2 100644 --- a/mcs/tools/csharp/ChangeLog +++ b/mcs/tools/csharp/ChangeLog @@ -1,3 +1,7 @@ +2009-12-16 Miguel de Icaza <miguel@novell.com> + + * repl.cs: Avoid crash, fixes 554898 + 2009-09-07 Marek Safar <marek.safar@gmail.com> * repl.cs: Disabled Report.Stderr hacking. diff --git a/mcs/tools/csharp/repl.cs b/mcs/tools/csharp/repl.cs index 02b03d1f0b1..379aa6a05a8 100644 --- a/mcs/tools/csharp/repl.cs +++ b/mcs/tools/csharp/repl.cs @@ -242,7 +242,7 @@ namespace Mono { public int ReadEvalPrintLoop () { - if (startup_files.Length == 0) + if (startup_files != null && startup_files.Length == 0) InitTerminal (); InitializeUsing (); |