diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-22 03:47:55 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-01-22 03:47:55 +0000 |
| commit | 44ae50d1fa8e09072f253000aded34926afa6f41 (patch) | |
| tree | 5f93494b6b94b6c301fba2815df7e6f4ed2d79b8 | |
| parent | 86197963ce07ee9f166189dc1a6817876b606d9d (diff) | |
| download | ATCD-44ae50d1fa8e09072f253000aded34926afa6f41.tar.gz | |
ChangeLogTag:Tue Jan 21 21:44:04 2003 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ACEXML/examples/SAXPrint/broken.xml | 5 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Parser.i | 3 | ||||
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 13 | ||||
| -rw-r--r-- | THANKS | 1 |
5 files changed, 32 insertions, 3 deletions
diff --git a/ACEXML/examples/SAXPrint/broken.xml b/ACEXML/examples/SAXPrint/broken.xml new file mode 100644 index 00000000000..fc8432680e8 --- /dev/null +++ b/ACEXML/examples/SAXPrint/broken.xml @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<!-- This is a broken XML file. Most of the stuff here don't make any sense at all --> + +<root> + <child> kid </child>
\ No newline at end of file diff --git a/ACEXML/parser/parser/Parser.i b/ACEXML/parser/parser/Parser.i index 5b6f072fba0..c483898ec85 100644 --- a/ACEXML/parser/parser/Parser.i +++ b/ACEXML/parser/parser/Parser.i @@ -115,7 +115,8 @@ ACEXML_Parser::get (void) if (this->instream_ != 0) { ACEXML_Char ch; - this->instream_->get (ch); + if (this->instream_->get (ch) == -1) + return 0; this->locator_.incrColumnNumber(); if (ch == 0x0A) { this->locator_.incrLineNumber(); diff --git a/ChangeLog b/ChangeLog index 1092652a9e0..444168d0933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Jan 21 21:44:04 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/examples/SAXPrint/broken.xml: Added a new broken XML file + to make sure we handle this case properly. + + * ACEXML/parser/parser/Parser.i (get): Added a check for + successful <get> operation from the input CharStream to avoid + out of the infinite loop when reading broken XML files. Thanks + to Volodymyr Orlenko <vorlenko@jaalam.com> for reporting this + and submitting the patch. + Mon Jan 20 20:32:55 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/Log_Msg.cpp (log): Added a '}' at line 1531 to fix a @@ -6,7 +17,7 @@ Mon Jan 20 20:32:55 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> Tue Jan 21 19:29:04 2003 Heather Drury <drury_h@ociweb.com> - * bin/auto_run_tests.lst: Disabled orbsvcs/Test/EC_MT_MCast on + * bin/auto_run_tests.lst: Disabled orbsvcs/Test/EC_MT_MCast on static builds. Tue Jan 21 08:43:24 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 1092652a9e0..444168d0933 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,14 @@ +Tue Jan 21 21:44:04 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/examples/SAXPrint/broken.xml: Added a new broken XML file + to make sure we handle this case properly. + + * ACEXML/parser/parser/Parser.i (get): Added a check for + successful <get> operation from the input CharStream to avoid + out of the infinite loop when reading broken XML files. Thanks + to Volodymyr Orlenko <vorlenko@jaalam.com> for reporting this + and submitting the patch. + Mon Jan 20 20:32:55 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> * ace/Log_Msg.cpp (log): Added a '}' at line 1531 to fix a @@ -6,7 +17,7 @@ Mon Jan 20 20:32:55 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> Tue Jan 21 19:29:04 2003 Heather Drury <drury_h@ociweb.com> - * bin/auto_run_tests.lst: Disabled orbsvcs/Test/EC_MT_MCast on + * bin/auto_run_tests.lst: Disabled orbsvcs/Test/EC_MT_MCast on static builds. Tue Jan 21 08:43:24 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> @@ -1652,6 +1652,7 @@ Vincent Chau <vincent.chau@fr.thalesgroup.com> Theo Landman <tlandman@justcroft.com> Igor Pisarenko <Igor.Pisarenko@computershare.com.au> Dima Scub <dima_scub@sniip.ru> +Volodymyr Orlenko <vorlenko@jaalam.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile |