RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-03-30 David Querbach <querbach@realtime.bc.ca>

Browse Source 
PR 595/tests
	* sp13/fillbuff.c, sp13/init.c, sp13/putbuff.c, sp13/system.h,
	sp13/task1.c, sp13/task2.c: Fill_buffer() in fillbuff.c overruns the
	supplied buffer due to confusion in the definition of MESSAGE_SIZE.
	Some files in the sp13 test treat MESSAGE_SIZE as a count of bytes,
	others treat it as a count of longs.
This commit is contained in:
Joel Sherrill
2004-03-30 19:46:24 +00:00
parent 6a15087d24
commit 04b4b389b8
7 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
c/src/tests/sptests/ChangeLog
View File

@@ -1,3 +1,12 @@
2004-03-30 David Querbach <querbach@realtime.bc.ca>
PR 595/tests
* sp13/fillbuff.c, sp13/init.c, sp13/putbuff.c, sp13/system.h,
sp13/task1.c, sp13/task2.c: Fill_buffer() in fillbuff.c overruns the
supplied buffer due to confusion in the definition of MESSAGE_SIZE.
Some files in the sp13 test treat MESSAGE_SIZE as a count of bytes,
others treat it as a count of longs.
2004-03-30 David Querbach <querbach@realtime.bc.ca>
PR 596/tests

21
c/src/tests/sptests/sp13/fillbuff.c
View File

@@ -21,26 +21,19 @@
#include "system.h"
#define MESSAGE_SIZE (sizeof(long) * 4)
void Fill_buffer(
char *source,
long *buffer
)
{
char *p;
int i;
/*
memcpy( buffer, source, 16 );
*/
int i, j;
p = source;
for ( i=0 ; i<MESSAGE_SIZE ; i++ ) {
buffer[i] = *p++;
buffer[i] <<= 8;
buffer[i] |= *p++;
buffer[i] <<= 8;
buffer[i] |= *p++;
buffer[i] <<= 8;
buffer[i] |= *p++;
for ( i = 0 ; i < MESSAGE_SIZE / sizeof(long) ; i++ ) {
buffer[i] = 0;
for ( j = sizeof(long) - 1; j >= 0; j-- ) {
buffer[i] |= *p++ << (8 * j);
}
}
}

2
c/src/tests/sptests/sp13/init.c
View File

@@ -24,8 +24,6 @@
#define TEST_INIT
#include "system.h"
#define MESSAGE_SIZE (sizeof(long) * 4)
rtems_task Init(
rtems_task_argument argument
)

21
c/src/tests/sptests/sp13/putbuff.c
View File

@@ -20,21 +20,18 @@
#include "system.h"
#define MESSAGE_SIZE (4)
void Put_buffer(
long *buffer
)
{
int i;
/*
printf( "%16s", (char *)buffer );
*/
for ( i=0 ; i< MESSAGE_SIZE ; i++ ) {
printf( "%c%c%c%c", (char) (buffer[i] >> 24),
(char) (buffer[i] >> 16 & 0xff),
(char) (buffer[i] >> 8 & 0xff),
(char) (buffer[i] >> 0 & 0xff) );
}
int i, j;
char c;
for ( i = 0; i < MESSAGE_SIZE / sizeof(long); i++ ) {
for ( j = sizeof(long) - 1; j >= 0; j-- ) {
if ( (c = (buffer[i] >> (8 * j)) & 0xFF) == 0 )
return;
printf( "%c", c );
}
}
}

4
c/src/tests/sptests/sp13/system.h
View File

@@ -66,4 +66,8 @@ TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */
TEST_EXTERN rtems_id Queue_id[ 4 ]; /* array of queue ids */
TEST_EXTERN rtems_name Queue_name[ 4 ]; /* array of queue names */
/* test configuration */
#define MESSAGE_SIZE (sizeof(long) * 4) /* must be multiple of sizeof(long) */
/* end of include file */

4
c/src/tests/sptests/sp13/task1.c
View File

@@ -23,9 +23,7 @@
char big_send_buffer[2048];
char big_receive_buffer[2048];
long buffer[ 4 ];
#define MESSAGE_SIZE (sizeof(long) * 4)
long buffer[ MESSAGE_SIZE / sizeof(long) ];
void dope_buffer(unsigned char *buff,
int buff_size,

2
c/src/tests/sptests/sp13/task2.c
View File

@@ -20,8 +20,6 @@
#include "system.h"
#define MESSAGE_SIZE (sizeof(long) * 4)
rtems_task Task_2(
rtems_task_argument argument
)