diff options
author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2014-03-26 16:42:26 +0100 |
---|---|---|
committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2014-04-01 10:21:04 +0200 |
commit | 2d3dc13f481bd6a5dfc16511f7df89903b69c4fd (patch) | |
tree | 6f0ffd297c7fc6c7b517784753455e2860bde8ec /src/tests | |
parent | 8594f384fe8d622c20e7cb6091a2e99313e9830e (diff) | |
download | DLT-daemon-2d3dc13f481bd6a5dfc16511f7df89903b69c4fd.tar.gz |
Fixed: all possible malloc, sprintf and strcpy problems
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/tests')
-rwxr-xr-x | src/tests/dlt-test-client.c | 2 | ||||
-rw-r--r-- | src/tests/dlt-test-multi-process-client.c | 7 | ||||
-rwxr-xr-x | src/tests/dlt-test-multi-process.c | 10 | ||||
-rw-r--r-- | src/tests/dlt-test-stress-client.c | 2 | ||||
-rw-r--r-- | src/tests/dlt-test-stress-user.c | 2 | ||||
-rwxr-xr-x | src/tests/dlt-test-stress.c | 6 | ||||
-rwxr-xr-x | src/tests/dlt-test-user.c | 2 |
7 files changed, 18 insertions, 13 deletions
diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index a8f10ff..75be454 100755 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -121,7 +121,7 @@ void usage() { char version[255]; - dlt_get_version(version); + dlt_get_version(version,255); printf("Usage: dlt-test-client [options] hostname/serial_device_name\n"); printf("Test against received data from dlt-test-user.\n"); diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c index 6aaabd8..95e622a 100644 --- a/src/tests/dlt-test-multi-process-client.c +++ b/src/tests/dlt-test-multi-process-client.c @@ -85,7 +85,7 @@ int receive(DltMessage *msg, void *data); */ void usage(char *name) { char version[255]; - dlt_get_version(version); + dlt_get_version(version,255); printf("Usage: %s [options] <remote address|serial device>\n", name); printf("Receive messages from dlt-test-multi-process.\n"); @@ -281,6 +281,11 @@ int receive(DltMessage *msg, void *data) { int buflen = msg->datasize + 1; char *buf = malloc(buflen); + if(buf==0) + { + printf("Out of memory\n"); + return -1; + } memset(buf, 0, buflen); dlt_message_payload(msg,buf,buflen-1,DLT_OUTPUT_ASCII,0); diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c index be5431b..bb81cb3 100755 --- a/src/tests/dlt-test-multi-process.c +++ b/src/tests/dlt-test-multi-process.c @@ -94,7 +94,7 @@ unsigned int pidcount = 0; void usage(char *prog_name) { char version[255]; - dlt_get_version(version); + dlt_get_version(version,255); s_parameters defaults; init_params(&defaults); @@ -298,8 +298,8 @@ void do_logging(s_thread_data *data) char ctid_name[256]; - sprintf(ctid,"%.2x", rand() & 0x0000ffff); - sprintf(ctid_name, "Child %s in dlt-test-multi-process", ctid); + snprintf(ctid,5,"%.2x", rand() & 0x0000ffff); + snprintf(ctid_name,256, "Child %s in dlt-test-multi-process", ctid); DLT_REGISTER_CONTEXT(mycontext, ctid, ctid_name); int msgs_left = data->params.nmsgs; @@ -324,8 +324,8 @@ void run_threads(s_parameters params) srand(getpid()); - sprintf(apid,"MT%02u", pidcount); - sprintf(apid_name, "Apps %s.", apid); + snprintf(apid,5,"MT%02u", pidcount); + snprintf(apid_name,256, "Apps %s.", apid); DLT_REGISTER_APP(apid, apid_name); diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index b9e54ad..e3498c0 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -129,7 +129,7 @@ void usage() { char version[255]; - dlt_get_version(version); + dlt_get_version(version,255); printf("Usage: dlt-test-stress-client [options] hostname/serial_device_name\n"); printf("Test against received data from dlt-test-stress-user.\n"); diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c index 648f61c..6f0683f 100644 --- a/src/tests/dlt-test-stress-user.c +++ b/src/tests/dlt-test-stress-user.c @@ -98,7 +98,7 @@ void usage() { char version[255]; - dlt_get_version(version); + dlt_get_version(version,255); printf("Usage: dlt-test-stress-user [options]\n"); printf("Test user application providing Test messages.\n"); diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c index 2f50e7e..650aecd 100755 --- a/src/tests/dlt-test-stress.c +++ b/src/tests/dlt-test-stress.c @@ -102,7 +102,7 @@ void usage() { char version[255]; - dlt_get_version(version); + dlt_get_version(version,255); printf("Usage: dlt-test-stress [options]\n"); printf("Test application executing several stress tests.\n"); @@ -248,7 +248,7 @@ void stress1(void) { /* Generate id */ memset(ctid,0,5); - sprintf(ctid,"%d",i); + snprintf(ctid,5,"%d",i); //printf("%i: '%s' \n",i,ctid); @@ -322,7 +322,7 @@ void thread_function(void) memset(ctid,0,5); /* Create random context id */ - sprintf(ctid,"%.2x", rand() & 0x0000ffff); + snprintf(ctid,5,"%.2x", rand() & 0x0000ffff); usleep(rand()/1000); diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c index c5940f2..6d6045f 100755 --- a/src/tests/dlt-test-user.c +++ b/src/tests/dlt-test-user.c @@ -122,7 +122,7 @@ void usage() { char version[255]; - dlt_get_version(version); + dlt_get_version(version,255); printf("Usage: dlt-test-user [options]\n"); printf("Test user application providing several Tests.\n"); |