From 9b361532e052ee3d31758343b19721ae4bcf017f Mon Sep 17 00:00:00 2001
From: zsfelfoldi <zsfelfoldi@gmail.com>
Date: Sat, 30 May 2015 16:27:09 +0200
Subject: [PATCH] fixed manifestTrie.getEntry

---
 bzz/api.go           |  5 +++++
 bzz/manifest_trie.go | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bzz/api.go b/bzz/api.go
index 2aa706f6a4..4646aafe89 100644
--- a/bzz/api.go
+++ b/bzz/api.go
@@ -309,14 +309,17 @@ func (self *Api) getPath(uri string) (reader SectionReader, mimeType string, sta
 	var key Key
 	key, err = self.Resolve(hostPort)
 	if err != nil {
+		dpaLogger.Debugf("Swarm: rResolve error: %v", err)
 		return
 	}
 
 	trie, err := loadManifestTrie(self.dpa, key)
 	if err != nil {
+		dpaLogger.Debugf("Swarm: loadManifestTrie error: %v", err)
 		return
 	}
 
+	dpaLogger.Debugf("Swarm: getEntry(%s)", path)
 	entry, _ := trie.getEntry(path)
 	if entry != nil {
 		key = common.Hex2Bytes(entry.Hash)
@@ -324,6 +327,8 @@ func (self *Api) getPath(uri string) (reader SectionReader, mimeType string, sta
 		mimeType = entry.ContentType
 		dpaLogger.Debugf("Swarm: content lookup key: '%064x' (%v)", key, mimeType)
 		reader = self.dpa.Retrieve(key)
+	} else {
+		dpaLogger.Debugf("Swarm: getEntry(%s): not found", path)
 	}
 	return
 }
diff --git a/bzz/manifest_trie.go b/bzz/manifest_trie.go
index cea527ca21..1cff3cad40 100644
--- a/bzz/manifest_trie.go
+++ b/bzz/manifest_trie.go
@@ -205,14 +205,22 @@ func (self *manifestTrie) loadSubTrie(entry *manifestTrieEntry) (err error) {
 }
 
 func (self *manifestTrie) findPrefixOf(path string) (entry *manifestTrieEntry, pos int) {
+
+	dpaLogger.Debugf("findPrefixOf(%s)", path)
+
 	if len(path) == 0 {
 		return self.entries[256], 0
 	}
 
 	b := byte(path[0])
 	entry = self.entries[b]
+	if entry == nil {
+		return nil, 0
+	}
 	epl := len(entry.Path)
+	dpaLogger.Debugf("path = %v  entry.Path = %v  epl = %v", path, entry.Path, epl)
 	if (len(path) >= epl) && (path[:epl] == entry.Path) {
+		dpaLogger.Debugf("entry.ContentType = %v", entry.ContentType)
 		if entry.ContentType == manifestType {
 			if self.loadSubTrie(entry) != nil {
 				return nil, 0
@@ -236,7 +244,7 @@ func (self *manifestTrie) getEntryNLS(path string) (entry *manifestTrieEntry, po
 		for (pos < len(path)) && (path[pos] == '/') {
 			pos++
 		}
-		if (pos > 0) && (path[pos-1] != '/') {
+		if (pos < len(path)) && (pos > 0) && (path[pos-1] != '/') {
 			return nil, 0
 		}
 	}
@@ -247,6 +255,7 @@ func (self *manifestTrie) getEntry(path string) (entry *manifestTrieEntry, pos i
 	var slash string
 	for {
 		entry, pos = self.getEntryNLS(slash + path)
+		dpaLogger.Debugf("getEntryNLS(%s) pos=%v", slash+path, pos)
 		if pos < len(slash) {
 			dpaLogger.Debugf("Path '%s' on manifest not found.", path)
 			return nil, 0