From ab36cc8beb9ac9d2019f80e44c69729072a64bfb Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Mon, 7 Dec 2015 01:15:23 -0200
Subject: [PATCH] Fixed bad_alloc on server
---
Protocol.cpp | 4 ++--
dirFunctions.cpp | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Protocol.cpp b/Protocol.cpp
index 66a35e1..efb8876 100644
--- a/Protocol.cpp
+++ b/Protocol.cpp
@@ -64,7 +64,7 @@ int Protocol::setData(vector<BYTE> data, int type){
msg.type = bitset<TYPE_S>(type);
int size = ((int)data.size())-i;
first = data.begin()+i;
- last = data.begin()+size+1;
+ last = data.begin()+i+size+1;
vector<BYTE> subvector(first, last);
msg.data = subvector;
if(size < MINSIZE){
@@ -179,7 +179,7 @@ void Protocol::receive(int sockt, int window){
}
else if(status == OUTPUT) {
cout << messages.back().getDataAsString();
-
+
frame.push_back(messages.size());
response.reset();
diff --git a/dirFunctions.cpp b/dirFunctions.cpp
index ec79426..d0e7aa4 100644
--- a/dirFunctions.cpp
+++ b/dirFunctions.cpp
@@ -26,6 +26,5 @@ string ls(string args){
output += buffer;
}
pclose(lsOut);
- cout << "output: "<< output<<endl;
return output;
-}
\ No newline at end of file
+}
--
GitLab