From dcfd7ee13c6ea3c88af7234bb18226cede99125a Mon Sep 17 00:00:00 2001
From: Felix Schumacher <p0354740@isib001.(none)>
Date: Wed, 6 Aug 2008 16:18:53 +0200
Subject: [PATCH] jcifs-0.9.5 from tgz

Thu Jul  1 18:53:20 EDT 2004
jcifs-0.9.5

A  bug  introduced  in 0.9.3 could result in an infinite loop that exhausts
all  memory  in  the VM when enumerating workgroups and servers. This issue
has  been  fixed.  Also included is an updated to the NtlmHttpURLConnection
(now works with org.apache.xmlrpc.XmlRpcClient).
---
 README.txt                                |  8 ++++++++
 build.xml                                 | 10 +++++-----
 src/jcifs/smb/NetServerEnum2.java         |  1 +
 src/jcifs/smb/NetServerEnum2Response.java |  2 +-
 src/jcifs/smb/ServerMessageBlock.java     |  5 ++++-
 src/jcifs/smb/SmbFile.java                |  1 +
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/README.txt b/README.txt
index faeea6e..da60127 100644
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,11 @@
+Thu Jul  1 18:53:20 EDT 2004
+jcifs-0.9.5
+
+A  bug  introduced  in 0.9.3 could result in an infinite loop that exhausts
+all  memory  in  the VM when enumerating workgroups and servers. This issue
+has  been  fixed.  Also included is an updated to the NtlmHttpURLConnection
+(now works with org.apache.xmlrpc.XmlRpcClient). 
+
 Mon Jun 28 13:29:39 EDT 2004
 jcifs-0.9.3 released
 
diff --git a/build.xml b/build.xml
index 9732470..09d2756 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <project name="jcifs" default="usage" basedir=".">
 
-    <property name="version" value="0.9.4"/>
+    <property name="version" value="0.9.5"/>
 
     <target name="usage">
         <echo>
@@ -181,8 +181,8 @@ dependencies: Checks that all class dependencies are met.
     <target name="docs">
         <style basedir="docs" destdir="docs" extension=".html" style="plain.xsl"
                 includes="pipes.xml,faq.xml,wins.xml,capture.xml,httpclient.xml,resolver.xml,authhandler.xml,ntlmhttpauth.xml">
-<param name="date" expression="Jun 30, 2004"/>
-<param name="lib" expression="jcifs-0.9.4"/>
+<param name="date" expression="Jul 2, 2004"/>
+<param name="lib" expression="jcifs-0.9.5"/>
 <param name="title" expression="JCIFS"/>
 <param name="copyright" expression="The JCIFS Project"/>
 <param name="edge" expression="#808080"/>
@@ -195,8 +195,8 @@ dependencies: Checks that all class dependencies are met.
         </style>
         <style basedir="docs" destdir="docs" extension=".html" style="proj.xsl"
                 includes="index.xml">
-<param name="date" expression="Jun 30, 2004"/>
-<param name="lib" expression="jcifs-0.9.4"/>
+<param name="date" expression="Jul 2, 2004"/>
+<param name="lib" expression="jcifs-0.9.5"/>
 <param name="title" expression="JCIFS"/>
 <param name="copyright" expression="The JCIFS Project"/>
 <param name="edge" expression="#808080"/>
diff --git a/src/jcifs/smb/NetServerEnum2.java b/src/jcifs/smb/NetServerEnum2.java
index c2627da..f7cb728 100644
--- a/src/jcifs/smb/NetServerEnum2.java
+++ b/src/jcifs/smb/NetServerEnum2.java
@@ -43,6 +43,7 @@ class NetServerEnum2 extends SmbComTransaction {
 
         maxParameterCount = 8;
 //        maxDataCount = 4096; why was this here?
+maxDataCount = 16384;
         maxSetupCount = (byte)0x00;
         setupCount = 0;
         timeout = 5000;
diff --git a/src/jcifs/smb/NetServerEnum2Response.java b/src/jcifs/smb/NetServerEnum2Response.java
index 5c89a7b..b0c1378 100644
--- a/src/jcifs/smb/NetServerEnum2Response.java
+++ b/src/jcifs/smb/NetServerEnum2Response.java
@@ -113,7 +113,7 @@ class NetServerEnum2Response extends SmbComTransactionResponse {
             off = start + off;
             e.commentOrMasterBrowser = readString( buffer, off, 48, false );
 
-            if( log.level > 2 )
+            if( log.level > 3 )
                 log.println( e );
         }
         lastName = numEntries == 0 ? null : e.name;
diff --git a/src/jcifs/smb/ServerMessageBlock.java b/src/jcifs/smb/ServerMessageBlock.java
index f6ac392..6a4fa0a 100644
--- a/src/jcifs/smb/ServerMessageBlock.java
+++ b/src/jcifs/smb/ServerMessageBlock.java
@@ -358,7 +358,8 @@ abstract class ServerMessageBlock {
                                             src[srcIndex + len + 1] != (byte)0x00 ) {
                     len += 2;
                     if( len > maxLen ) {
-Hexdump.hexdump( System.err, src, 0, 256 );
+if( log.level > 0 )
+Hexdump.hexdump( System.err, src, srcIndex, maxLen < 128 ? maxLen + 8 : 128 );
                         throw new RuntimeException( "zero termination not found" );
                     }
                 }
@@ -367,6 +368,8 @@ Hexdump.hexdump( System.err, src, 0, 256 );
                 while( src[srcIndex + len] != (byte)0x00 ) {
                     len++;
                     if( len > maxLen ) {
+if( log.level > 0 )
+Hexdump.hexdump( System.err, src, srcIndex, maxLen < 128 ? maxLen + 8 : 128 );
                         throw new RuntimeException( "zero termination not found" );
                     }
                 }
diff --git a/src/jcifs/smb/SmbFile.java b/src/jcifs/smb/SmbFile.java
index 2c7ba61..adbf7e2 100644
--- a/src/jcifs/smb/SmbFile.java
+++ b/src/jcifs/smb/SmbFile.java
@@ -1634,6 +1634,7 @@ public class SmbFile extends URLConnection {
             }
             req.subCommand = (byte)SmbComTransaction.NET_SERVER_ENUM3;
             req.reset( 0, ((NetServerEnum2Response)resp).lastName );
+            resp.reset();
         } while( more );
     }
     void doFindFirstNext( ArrayList list,
-- 
2.11.0