VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-08-12 02:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues found via coverity scan

Browse Source
This commit is contained in:
Kai Krueger
2013-10-23 20:09:56 -06:00
parent e2c4b62e67
commit c0bc71162d
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gen_tile.cpp
View File

@ -189,6 +189,7 @@ static void parameterize_map_max_connections(Map &m, int num_threads) {
#endif #endif
l.set_datasource(ds); l.set_datasource(ds);
} }
free(tmp);
} }

15
src/protocol_helper.c
View File

@ -8,6 +8,10 @@
int send_cmd(struct protocol * cmd, int fd) { int send_cmd(struct protocol * cmd, int fd) {
int ret; int ret;
syslog(LOG_DEBUG, "DEBUG: Sending render cmd with protocol version %i\n", cmd->ver); syslog(LOG_DEBUG, "DEBUG: Sending render cmd with protocol version %i\n", cmd->ver);
if ((cmd->ver > 3) || (cmd->ver < 1)) {
syslog(LOG_WARNING, "WARNING: Failed to send render cmd with unknown protocol version %i\n", cmd->ver);
return -1;
}
switch (cmd->ver) { switch (cmd->ver) {
case 1: case 1:
ret = send(fd, cmd, sizeof(struct protocol_v1), 0); ret = send(fd, cmd, sizeof(struct protocol_v1), 0);
@ -34,15 +38,22 @@ int recv_cmd(struct protocol * cmd, int fd) {
} else if (ret < sizeof(struct protocol_v1)) { } else if (ret < sizeof(struct protocol_v1)) {
return 0; return 0;
} }
if ((cmd->ver > 3) || (cmd->ver < 1)) {
syslog(LOG_WARNING, "WARNING: Failed to recieve render cmd with unknown protocol version %i\n", cmd->ver);
return -1;
}
syslog(LOG_DEBUG, "DEBUG: Got incoming request with protocol version %i\n", cmd->ver); syslog(LOG_DEBUG, "DEBUG: Got incoming request with protocol version %i\n", cmd->ver);
switch (cmd->ver) { switch (cmd->ver) {
case 1:
ret2 = 0;
break;
case 2: ret2 = recv(fd, ((void*)cmd) + sizeof(struct protocol_v1), sizeof(struct protocol_v2) - sizeof(struct protocol_v1), MSG_DONTWAIT); case 2: ret2 = recv(fd, ((void*)cmd) + sizeof(struct protocol_v1), sizeof(struct protocol_v2) - sizeof(struct protocol_v1), MSG_DONTWAIT);
break; break;
case 3: ret2 = recv(fd, ((void*)cmd) + sizeof(struct protocol_v1), sizeof(struct protocol) - sizeof(struct protocol_v1), MSG_DONTWAIT); case 3: ret2 = recv(fd, ((void*)cmd) + sizeof(struct protocol_v1), sizeof(struct protocol) - sizeof(struct protocol_v1), MSG_DONTWAIT);
break; break;
} }
if (ret2 < 1) { if ((cmd->ver > 1) && (ret2 < 1)) {
syslog(LOG_WARNING, "WARNING: Socket prematurely closed: %i\n", fd); syslog(LOG_WARNING, "WARNING: Socket prematurely closed: %i\n", fd);
return -1; return -1;
} }