summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-06-15 20:08:27 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-06-15 20:08:27 +0000
commit7ec6a9d42010848987d733d83a0ee054ec457679 (patch)
tree533c62988bac5f400a3c6fb84bc5480f10b2a75b
parent4623ec755fce667d2241f9f77e3306f807b71bbd (diff)
downloadgcc-7ec6a9d42010848987d733d83a0ee054ec457679.tar.gz
2005-06-15 Goffredo Baroncelli <kreijack@inwind.it>
PR libgcj/21074: * gnu/java/net/protocol/http/HTTPURLConnection.java (getHeaderFieldKey): Check index. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100994 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/gnu/java/net/protocol/http/HTTPURLConnection.java6
2 files changed, 11 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 813eef1db91..d2653a42328 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-15 Goffredo Baroncelli <kreijack@inwind.it>
+
+ PR libgcj/21074:
+ * gnu/java/net/protocol/http/HTTPURLConnection.java
+ (getHeaderFieldKey): Check index.
+
2005-06-15 Tom Tromey <tromey@redhat.com>
PR libgcj/21906:
diff --git a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java b/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java
index 50a6ed12e7a..b82d30f5ae6 100644
--- a/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java
+++ b/libjava/gnu/java/net/protocol/http/HTTPURLConnection.java
@@ -1,5 +1,5 @@
/* HTTPURLConnection.java --
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -572,6 +572,10 @@ public class HTTPURLConnection
int count = 1;
do
{
+ if (!i.hasNext())
+ {
+ return null;
+ }
entry = (Map.Entry) i.next();
count++;
}