Merge pull request 'Bugfixes 2' (#208) from bugfixes2 into master

Reviewed-on: #208

libs/client_server/piclientserver_server.cpp

@@ -37,6 +37,7 @@ PIClientServer::Server::Server() {
 		auto sc = client_factory();
 		if (!sc) {
 			piCout << "ClientFactory returns nullptr!"_tr("PIClientServer");
+			delete c;
 			return;
 		}
 		sc->createForServer(this, c);

libs/main/core/piwaitevent_p.cpp

@@ -65,9 +65,9 @@ void PIWaitEvent::destroy() {
 	}
 #else
 	for (int i = 0; i < 2; ++i) {
-		if (pipe_fd[i] != 0) {
+		if (pipe_fd[i] != -1) {
 			::close(pipe_fd[i]);
-			pipe_fd[i] = 0;
+			pipe_fd[i] = -1;
 		}
 	}
 #endif
@@ -140,7 +140,7 @@ bool PIWaitEvent::isCreate() const {
 #ifdef WINDOWS
 	return event;
 #else
-	return pipe_fd[ReadEnd] != 0;
+	return pipe_fd[ReadEnd] != -1;
 #endif
 }
 

libs/main/core/piwaitevent_p.h

@@ -55,7 +55,7 @@ private:
 #ifdef WINDOWS
 	void * event = nullptr;
 #else
-	int pipe_fd[2] = {0, 0};
+	int pipe_fd[2] = {-1, -1};
 	fd_set fds[3];
 	enum {
 		ReadEnd  = 0,

libs/main/io_devices/pican.cpp

@@ -24,6 +24,7 @@
 #  define PIP_CAN
 #endif
 #ifdef PIP_CAN
+#  include <fcntl.h>
 #  include <linux/can.h>
 #  include <linux/can/raw.h>
 #  include <net/if.h>
@@ -49,7 +50,7 @@ PICAN::PICAN(const PIString & path, PIIODevice::DeviceMode mode): PIIODevice(pat
 	setThreadedReadBufferSize(256);
 	setPath(path);
 	can_id = 0;
-	sock   = 0;
+	sock   = -1;
 	PRIVATE->event.create();
 }
 
@@ -67,19 +68,25 @@ bool PICAN::openDevice() {
 	sock = socket(PF_CAN, SOCK_RAW, CAN_RAW);
 	if (sock < 0) {
 		piCoutObj << "Error! while opening socket";
+		sock = -1;
 		return false;
 	}
+	fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK);
 	ifreq ifr;
 	strcpy(ifr.ifr_name, path().dataAscii());
 	piCout << "PICAN try to get interface index...";
 	if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) {
 		piCoutObj << "Error! while determin the interface ioctl";
+		::close(sock);
+		sock = -1;
 		return false;
 	}
 	struct timeval tv;
 	tv.tv_sec  = 1;
 	tv.tv_usec = 0;
-	setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char *)&tv, sizeof tv);
+	if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char *)&tv, sizeof tv) < 0) {
+		piCoutObj << "Error! while setting socket receive timeout";
+	}
 	// bind socket to all CAN interface
 	sockaddr_can addr;
 	addr.can_family  = AF_CAN;
@@ -87,6 +94,8 @@ bool PICAN::openDevice() {
 	piCout << "PICAN try to bind socket to interface" << ifr.ifr_ifindex;
 	if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		piCoutObj << "Error! while binding socket";
+		::close(sock);
+		sock = -1;
 		return false;
 	}
 	piCout << "PICAN Open OK!";
@@ -101,7 +110,11 @@ bool PICAN::openDevice() {
 bool PICAN::closeDevice() {
 #ifdef PIP_CAN
 	interrupt();
-	if (sock > 0) ::close(sock);
+	if (sock != -1) {
+		::shutdown(sock, SHUT_RDWR);
+		::close(sock);
+		sock = -1;
+	}
 #endif
 	return true;
 }
@@ -109,6 +122,7 @@ bool PICAN::closeDevice() {
 
 ssize_t PICAN::readDevice(void * read_to, ssize_t max_size) {
 #ifdef PIP_CAN
+	if (sock == -1) return -1;
 	// piCout << "PICAN read";
 	can_frame frame;
 	ssize_t ret = 0;
@@ -127,6 +141,7 @@ ssize_t PICAN::readDevice(void * read_to, ssize_t max_size) {
 
 ssize_t PICAN::writeDevice(const void * data, ssize_t max_size) {
 #ifdef PIP_CAN
+	if (sock == -1) return -1;
 	// piCout << "PICAN write" << can_id << max_size;
 	if (max_size > 8) {
 		piCoutObj << "Can't send CAN frame bigger than 8 bytes (requested " << max_size << ")!";

libs/main/io_devices/pican.h

@@ -73,7 +73,7 @@ protected:
 
 private:
 	PRIVATE_DECLARATION(PIP_EXPORT)
-	int sock;
+	int sock = -1;
 	int can_id, readed_id;
 };
 

libs/main/io_devices/piethernet.cpp

@@ -1234,7 +1234,7 @@ PIEthernet::InterfaceList PIEthernet::interfaces() {
 #	  ifdef QNX
 #		ifndef BLACKBERRY
 			int fd = ::open((PIString("/dev/io-net/") + ci.name).dataAscii(), O_RDONLY);
-			if (fd != 0) {
+			if (fd >= 0) {
 				nic_config_t nic;
 				devctl(fd, DCMD_IO_NET_GET_CONFIG, &nic, sizeof(nic), 0);
 				::close(fd);

libs/main/io_devices/piiobytearray.cpp

@@ -62,8 +62,7 @@ ssize_t PIIOByteArray::readDevice(void * read_to, ssize_t size) {
 	if (ret <= 0) return -1;
 	memcpy(read_to, data_->data(pos), ret);
 	// piCout << "readed" << ret;
-	pos += size;
+	pos += ret;
-	if (pos > data_->size_s()) pos = data_->size_s();
 	return ret;
 }
 

libs/main/io_devices/pipeer.cpp

@@ -623,7 +623,10 @@ bool PIPeer::dataRead(const uchar * readed, ssize_t size) {
 			return true;
 		}
 		cnt++;
-		if (cnt > _PIPEER_MSG_TTL || from == dp->name) return true;
+		if (cnt > _PIPEER_MSG_TTL || from == dp->name) {
+			eth_mutex.unlock();
+			return true;
+		}
 		sba << type << from << to << cnt << pba;
 		// piCout << "translate packet" << from << "->" << to << ", ttl =" << cnt;
 		sendToNeighbour(dp, sba);

libs/main/io_devices/piserial.cpp

@@ -513,7 +513,10 @@ bool PISerial::read(void * data, int size, double timeout_ms) {
 		all     = readDevice(data, 1);
 		while (all < size) {
 			ret = readDevice(&((uchar *)data)[all], size - all);
-			if (ret > 0) all += ret;
+			if (ret > 0)
+				all += ret;
+			else
+				break;
 		}
 		setOption(BlockingRead, br);
 		received(data, all);

libs/main/io_utils/pifiletransfer.cpp

@@ -131,6 +131,12 @@ bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> & files) {
 
 void PIFileTransfer::processFile(int id, ullong start, PIByteArray & data) {
 	// piCout << "processFile" << id << files_.size();
+	if (id <= 0 || id > files_.size_s()) {
+		cur_file_string = "Error: Invalid file id " + PIString::fromNumber(id);
+		piCoutObj << cur_file_string;
+		stopReceive();
+		return;
+	}
 	PFTFileInfo fi  = files_[id - 1];
 	bytes_file_all  = fi.size;
 	bytes_file_cur  = start;

libs/main/system/piprocess.cpp

@@ -319,6 +319,13 @@ void PIProcess::startProc(bool detached) {
 	auto largs = convertToCharArrays(args);
 	auto lenv  = convertToCharArrays(env);
 	int pid_   = fork();
+	if (pid_ < 0) {
+		piCoutObj << "\"fork\" error: " << errorString();
+		PRIVATE->closeAllPipes();
+		delete[] largs;
+		delete[] lenv;
+		return;
+	}
 	if (!detached) PRIVATE->pid = pid_;
 	if (pid_ == 0) {
 		if (!wd.isEmpty()) {

libs/main/text/pistring.cpp

@@ -671,7 +671,7 @@ PIString & PIString::operator+=(const PIConstChars & str) {
 	if (!str.isEmpty()) {
 		size_t os = d.size();
 		d.enlarge(str.size());
-		for (size_t l = 0; l < d.size(); ++l) {
+		for (size_t l = 0; l < str.size(); ++l) {
 			d[os + l] = str[l];
 		}
 	}
@@ -1763,7 +1763,7 @@ PIString PIString::toLowerCase() const {
 
 
 char PIString::toChar() const {
-	char v;
+	char v = 0;
 	sscanf(dataAscii(), "%c", &v);
 	return v;
 }

libs/mqtt_client/pimqttclient.cpp

@@ -60,7 +60,7 @@ STATIC_INITIALIZER_END
 
 PRIVATE_DEFINITION_START(PIMQTT::Client)
 	MQTTClient client = nullptr;
-	bool connected    = false;
+	std::atomic<bool> connected{false};
 
 	PIProtectedVariable<EndpointsStorage> endpoints;