From 847a441d598891747786b6e3383c2e7c474f9d1b Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 28 Jun 2013 12:01:13 +0000 Subject: [PATCH] disapproval of revision '8611baad56e8e18941721b156256783ba996a3cd' Revert 8611baad56e8e18941721b156256783ba996a3cd Don't use intern() on externally-supplied strings as it could be used to exhaust memory --- core/java/src/net/i2p/data/RouterAddress.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java index 27c529c49..c21f0f5bf 100644 --- a/core/java/src/net/i2p/data/RouterAddress.java +++ b/core/java/src/net/i2p/data/RouterAddress.java @@ -215,8 +215,12 @@ public class RouterAddress extends DataStructureImpl { _cost = (int) DataHelper.readLong(in, 1); //_expiration = DataHelper.readDate(in); DataHelper.readDate(in); + _transportStyle = DataHelper.readString(in); // reduce Object proliferation - _transportStyle = DataHelper.readString(in).intern(); + if (_transportStyle.equals("SSU")) + _transportStyle = "SSU"; + else if (_transportStyle.equals("NTCP")) + _transportStyle = "NTCP"; DataHelper.readProperties(in, _options); }