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

2010-08-25 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
CID 113/SECURE_CODING
	* libblock/src/media-path.c: Avoid strcpy().  Style.  Use assert() to
	avoid dead code.
This commit is contained in:
Sebastian Huber
2010-08-25 08:26:21 +00:00
parent e0b6d43e95
commit 2b5bd836ce
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2010-08-25 Sebastian Huber <sebastian.huber@embedded-brains.de>
CID 113/SECURE_CODING
* libblock/src/media-path.c: Avoid strcpy(). Style. Use assert() to
avoid dead code.
2010-08-24 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1673/cpukit

50
cpukit/libblock/src/media-path.c
View File

@@ -24,22 +24,22 @@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <assert.h>
#include <rtems/media.h>
char *rtems_media_create_path(const char *prefix, const char *name, rtems_device_major_number major)
char *rtems_media_create_path(
const char *prefix,
const char *name,
rtems_device_major_number major
)
{
size_t const len = strlen(prefix) + 1 + strlen(name) + 1 + 10 + 1;
char *const s = malloc(len);
size_t const size = strlen(prefix) + 1 + strlen(name) + 1 + 10 + 1;
char *const s = malloc(size);
if (s != NULL) {
int rv = snprintf(s, len, "%s/%s-%" PRIu32, prefix, name, major);
if (rv >= (int) len) {
free(s);
return NULL;
}
int rv = snprintf(s, size, "%s/%s-%" PRIu32, prefix, name, major);
assert(rv < (int) size);
}
return s;
@@ -50,32 +50,30 @@ char *rtems_media_replace_prefix(const char *new_prefix, const char *path)
const char *const name_try = strrchr(path, '/');
const char *const name = (name_try == NULL) ? path : name_try + 1;
size_t const new_prefix_len = strlen(new_prefix);
size_t const name_len = strlen(name);
size_t const len = new_prefix_len + 1 + name_len + 1;
char *const s = malloc(len);
size_t const name_size = strlen(name) + 1;
size_t const size = new_prefix_len + 1 + name_size;
char *const s = malloc(size);
if (s != NULL) {
strcpy(s, new_prefix);
strcpy(s + new_prefix_len, "/");
strcpy(s + new_prefix_len + 1, name);
memcpy(s, new_prefix, new_prefix_len);
s [new_prefix_len] = '/';
memcpy(s + new_prefix_len + 1, name, name_size);
}
return s;
}
char *rtems_media_append_minor(const char *path, rtems_device_minor_number minor)
char *rtems_media_append_minor(
const char *path,
rtems_device_minor_number minor
)
{
size_t const len = strlen(path) + 1 + 10 + 1;
char *const s = malloc(len);
size_t const size = strlen(path) + 1 + 10 + 1;
char *const s = malloc(size);
if (s != NULL) {
int rv = snprintf(s, len, "%s-%" PRIu32, path, minor);
if (rv >= (int) len) {
free(s);
return NULL;
}
int rv = snprintf(s, size, "%s-%" PRIu32, path, minor);
assert(rv < (int) size);
}
return s;