projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d0246cf
)
Fix binary-string confusion in client network code
author
sfan5
<sfan5@live.de>
Sun, 4 Aug 2019 18:40:35 +0000
(20:40 +0200)
committer
sfan5
<sfan5@live.de>
Sun, 4 Aug 2019 18:40:35 +0000
(20:40 +0200)
src/network/clientpackethandler.cpp
patch
|
blob
|
history
diff --git
a/src/network/clientpackethandler.cpp
b/src/network/clientpackethandler.cpp
index 2f5deae2a75042565b057bf83016e497057657e0..1ae47d190edadf00a6d15b636446405e63721ba4 100644
(file)
--- a/
src/network/clientpackethandler.cpp
+++ b/
src/network/clientpackethandler.cpp
@@
-900,7
+900,7
@@
void Client::handleCommand_DetachedInventory(NetworkPacket* pkt)
u16 ignore;
*pkt >> ignore; // this used to be the length of the following string, ignore it
- std::string contents
= pkt->getRemainingString(
);
+ std::string contents
(pkt->getRemainingString(), pkt->getRemainingBytes()
);
std::istringstream is(contents, std::ios::binary);
inv->deSerialize(is);
}