[freenet-cvs] r15564 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-10-25 18:27:31 +0000 (Thu, 25 Oct 2007)
New Revision: 15564

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Doh. newNoderef not noderef. fixes possible NPEs and ArrayIndexOOB's.

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-25 18:23:56 UTC 
(rev 15563)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2007-10-25 18:27:31 UTC 
(rev 15564)
@@ -401,15 +401,15 @@

                byte[] newNoderef = om.waitForOpennetNoderef(true, source, uid, 
this);

-               if(noderef == null) return;
+               if(newNoderef == null) return;

                // Send it forward to the data source, if it is valid.

                try {
-                       SimpleFieldSet fs = 
PeerNode.compressedNoderefToFieldSet(newNoderef, 0, noderef.length);
+                       SimpleFieldSet fs = 
PeerNode.compressedNoderefToFieldSet(newNoderef, 0, newNoderef.length);
                        if(fs.getBoolean("opennet", false)) {
                                try {
-                                       om.sendOpennetRef(true, uid, 
dataSource, noderef, this);
+                                       om.sendOpennetRef(true, uid, 
dataSource, newNoderef, this);
                                } catch (NotConnectedException e) {
                                        // How sad
                                        return;