Fixes to Coverity defects: 72662 82143 82144 82145 82348 82349
This commit is contained in:
@ -184,7 +184,7 @@ char c;
|
|||||||
}
|
}
|
||||||
|
|
||||||
cmd = malloc(len + (2 * argc)); // Allow for quotes
|
cmd = malloc(len + (2 * argc)); // Allow for quotes
|
||||||
strcpy(cmd, argv[optind]);
|
strncpy(cmd, argv[optind],len + (2 * argc));
|
||||||
for (i = optind +1; i < argc; i++)
|
for (i = optind +1; i < argc; i++)
|
||||||
{
|
{
|
||||||
strcat(cmd, " ");
|
strcat(cmd, " ");
|
||||||
|
@ -1181,7 +1181,7 @@ int above_water;
|
|||||||
void
|
void
|
||||||
dcb_close(DCB *dcb)
|
dcb_close(DCB *dcb)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc = 0;
|
||||||
|
|
||||||
CHK_DCB(dcb);
|
CHK_DCB(dcb);
|
||||||
|
|
||||||
|
@ -1585,9 +1585,26 @@ int main(int argc, char **argv)
|
|||||||
* machine.
|
* machine.
|
||||||
*/
|
*/
|
||||||
sprintf(datadir, "%s/data", home_dir);
|
sprintf(datadir, "%s/data", home_dir);
|
||||||
mkdir(datadir, 0777);
|
|
||||||
|
if(mkdir(datadir, 0777) != 0){
|
||||||
|
|
||||||
|
if(errno != EEXIST){
|
||||||
|
fprintf(stderr,
|
||||||
|
"Error: Cannot create data directory: %s\n",datadir);
|
||||||
|
goto return_main;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sprintf(datadir, "%s/data/data%d", home_dir, getpid());
|
sprintf(datadir, "%s/data/data%d", home_dir, getpid());
|
||||||
mkdir(datadir, 0777);
|
|
||||||
|
if(mkdir(datadir, 0777) != 0){
|
||||||
|
|
||||||
|
if(errno != EEXIST){
|
||||||
|
fprintf(stderr,
|
||||||
|
"Error: Cannot create data directory: %s\n",datadir);
|
||||||
|
goto return_main;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!daemon_mode)
|
if (!daemon_mode)
|
||||||
{
|
{
|
||||||
|
@ -1444,7 +1444,7 @@ void
|
|||||||
dShowEventQ(DCB *pdcb)
|
dShowEventQ(DCB *pdcb)
|
||||||
{
|
{
|
||||||
DCB *dcb;
|
DCB *dcb;
|
||||||
|
char *tmp1, *tmp2;
|
||||||
spinlock_acquire(&pollqlock);
|
spinlock_acquire(&pollqlock);
|
||||||
if (eventq == NULL)
|
if (eventq == NULL)
|
||||||
{
|
{
|
||||||
@ -1460,8 +1460,10 @@ DCB *dcb;
|
|||||||
do {
|
do {
|
||||||
dcb_printf(pdcb, "%-16p | %-10s | %-18s | %-18s\n", dcb,
|
dcb_printf(pdcb, "%-16p | %-10s | %-18s | %-18s\n", dcb,
|
||||||
dcb->evq.processing ? "Processing" : "Pending",
|
dcb->evq.processing ? "Processing" : "Pending",
|
||||||
event_to_string(dcb->evq.processing_events),
|
(tmp1 = event_to_string(dcb->evq.processing_events)),
|
||||||
event_to_string(dcb->evq.pending_events));
|
(tmp2 = event_to_string(dcb->evq.pending_events)));
|
||||||
|
free(tmp1);
|
||||||
|
free(tmp2);
|
||||||
dcb = dcb->evq.next;
|
dcb = dcb->evq.next;
|
||||||
} while (dcb != eventq);
|
} while (dcb != eventq);
|
||||||
spinlock_release(&pollqlock);
|
spinlock_release(&pollqlock);
|
||||||
|
@ -406,7 +406,7 @@ GWBUF *clone = NULL;
|
|||||||
if (my_session->residual < 0)
|
if (my_session->residual < 0)
|
||||||
my_session->residual = 0;
|
my_session->residual = 0;
|
||||||
}
|
}
|
||||||
else if (my_session->active && (ptr = modutil_get_SQL(queue) != NULL))
|
else if ( my_session->active && (ptr = modutil_get_SQL(queue)) != NULL)
|
||||||
{
|
{
|
||||||
if ((my_instance->match == NULL ||
|
if ((my_instance->match == NULL ||
|
||||||
regexec(&my_instance->re, ptr, 0, NULL, 0) == 0) &&
|
regexec(&my_instance->re, ptr, 0, NULL, 0) == 0) &&
|
||||||
|
@ -1147,6 +1147,9 @@ int compare_files(int a,int b)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
memset(in,0,4098);
|
||||||
|
memset(exp,0,4098);
|
||||||
|
|
||||||
while(fdgets(a,in,4098) && fdgets(b,exp,4098)){
|
while(fdgets(a,in,4098) && fdgets(b,exp,4098)){
|
||||||
if(strcmp(in,exp)){
|
if(strcmp(in,exp)){
|
||||||
printf("The files differ at line %d:\n%s\n-------------------------------------\n%s\n",line,in,exp);
|
printf("The files differ at line %d:\n%s\n-------------------------------------\n%s\n",line,in,exp);
|
||||||
|
@ -606,7 +606,7 @@ MONITOR_SERVERS *ptr;
|
|||||||
int replication_heartbeat = handle->replicationHeartbeat;
|
int replication_heartbeat = handle->replicationHeartbeat;
|
||||||
int detect_stale_master = handle->detectStaleMaster;
|
int detect_stale_master = handle->detectStaleMaster;
|
||||||
int num_servers=0;
|
int num_servers=0;
|
||||||
MONITOR_SERVERS *root_master;
|
MONITOR_SERVERS *root_master = NULL;
|
||||||
size_t nrounds = 0;
|
size_t nrounds = 0;
|
||||||
|
|
||||||
if (mysql_thread_init())
|
if (mysql_thread_init())
|
||||||
|
@ -173,7 +173,7 @@ HTTPD_session *client_data = NULL;
|
|||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
while (ISspace(buf[j]) && (j < sizeof(buf))) {
|
while ( (j < sizeof(buf)) && ISspace(buf[j])) {
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -354,6 +354,7 @@ int n_connect = 0;
|
|||||||
n_connect++;
|
n_connect++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
close(so);
|
||||||
}
|
}
|
||||||
|
|
||||||
return n_connect;
|
return n_connect;
|
||||||
|
Reference in New Issue
Block a user