SHS/pip
4
3
Fork 0
Code Issues 16 Pull Requests 2 Actions Releases Wiki Activity

Bugfixes part 3 #209

Open
andrey wants to merge 36 commits from bugfixes3 into master
pull from: bugfixes3
merge into: :master
Conversation 0 Commits 36 Files Changed 27
+6 -4
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7dd3cb5ee4 - Show all commits
libs/main/core/piinit.cpp
+2 -2
View File
@@ -270,8 +270,8 @@ PIInit::~PIInit() {
mach_port_deallocate(mach_task_self(), __pi_mac_clock); mach_port_deallocate(mach_task_self(), __pi_mac_clock);
# endif # endif
if (PRIVATE->delete_locs) { if (PRIVATE->delete_locs) {
if (__syslocname__) delete __syslocname__; if (__syslocname__) delete[] __syslocname__;
if (__sysoemname__) delete __sysoemname__; if (__sysoemname__) delete[] __sysoemname__;
} }
# ifdef PIP_ICU # ifdef PIP_ICU
u_cleanup(); u_cleanup();
libs/main/io_devices/pican.cpp
+2 -2
View File
@@ -124,8 +124,8 @@ ssize_t PICAN::readDevice(void * read_to, ssize_t max_size) {
#ifdef PIP_CAN #ifdef PIP_CAN
if (sock == -1) return -1; if (sock == -1) return -1;
// piCout << "PICAN read"; // piCout << "PICAN read";
can_frame frame; can_frame frame = {};
ssize_t ret = 0; ssize_t ret = 0;
if (PRIVATE->event.wait(sock)) ret = ::read(sock, &frame, sizeof(can_frame)); if (PRIVATE->event.wait(sock)) ret = ::read(sock, &frame, sizeof(can_frame));
if (ret < 0) { /*piCoutObj << "Error while read CAN frame " << ret;*/ if (ret < 0) { /*piCoutObj << "Error while read CAN frame " << ret;*/
return -1; return -1;
libs/main/io_devices/pisharedmemory.cpp
+2
View File
@@ -251,6 +251,7 @@ int PISharedMemory::read(void * read_to, int max_size) {
int PISharedMemory::read(void * read_to, int max_size, int offset) { int PISharedMemory::read(void * read_to, int max_size, int offset) {
if (offset < 0 || max_size < 0 || offset > dsize - max_size) return -1;
#ifdef WINDOWS #ifdef WINDOWS
if (!PRIVATE->data) return -1; if (!PRIVATE->data) return -1;
CopyMemory(read_to, &(((char *)(PRIVATE->data))[offset]), max_size); CopyMemory(read_to, &(((char *)(PRIVATE->data))[offset]), max_size);
@@ -271,6 +272,7 @@ int PISharedMemory::write(const void * data, int max_size) {
int PISharedMemory::write(const void * data, int max_size, int offset) { int PISharedMemory::write(const void * data, int max_size, int offset) {
if (offset < 0 || max_size < 0 || offset > dsize - max_size) return -1;
#ifdef WINDOWS #ifdef WINDOWS
if (!PRIVATE->data) return -1; if (!PRIVATE->data) return -1;
CopyMemory(&(((char *)(PRIVATE->data))[offset]), data, max_size); CopyMemory(&(((char *)(PRIVATE->data))[offset]), data, max_size);