From d2be104ba64fa3254587479bcde2ba8bcacfdb8d Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Fri, 22 Apr 2016 20:08:27 +0200 Subject: [PATCH] src/io/: also copy null ending char --- src/io/sink_apple_audio.c | 4 ++-- src/io/sink_sndfile.c | 4 ++-- src/io/sink_wavwrite.c | 4 ++-- src/io/source_apple_audio.c | 4 ++-- src/io/source_avcodec.c | 4 ++-- src/io/source_sndfile.c | 4 ++-- src/io/source_wavread.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/io/sink_apple_audio.c b/src/io/sink_apple_audio.c index 6f3f3588..b6fd3585 100644 --- a/src/io/sink_apple_audio.c +++ b/src/io/sink_apple_audio.c @@ -67,8 +67,8 @@ aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(const char_t * uri, uint_t goto beach; } if (s->path != NULL) AUBIO_FREE(s->path); - s->path = AUBIO_ARRAY(char_t, strnlen(uri, PATH_MAX)); - strncpy(s->path, uri, strnlen(uri, PATH_MAX)); + s->path = AUBIO_ARRAY(char_t, strnlen(uri, PATH_MAX) + 1); + strncpy(s->path, uri, strnlen(uri, PATH_MAX) + 1); s->samplerate = 0; s->channels = 0; diff --git a/src/io/sink_sndfile.c b/src/io/sink_sndfile.c index c43fbc3c..99392c3c 100644 --- a/src/io/sink_sndfile.c +++ b/src/io/sink_sndfile.c @@ -63,8 +63,8 @@ aubio_sink_sndfile_t * new_aubio_sink_sndfile(const char_t * path, uint_t sample } if (s->path) AUBIO_FREE(s->path); - s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX)); - strncpy(s->path, path, strnlen(path, PATH_MAX)); + s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); + strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); s->samplerate = 0; s->channels = 0; diff --git a/src/io/sink_wavwrite.c b/src/io/sink_wavwrite.c index d99c1628..761f6e59 100644 --- a/src/io/sink_wavwrite.c +++ b/src/io/sink_wavwrite.c @@ -90,8 +90,8 @@ aubio_sink_wavwrite_t * new_aubio_sink_wavwrite(const char_t * path, uint_t samp } if (s->path) AUBIO_FREE(s->path); - s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX)); - strncpy(s->path, path, strnlen(path, PATH_MAX)); + s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); + strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); s->max_size = MAX_SIZE; s->bitspersample = 16; diff --git a/src/io/source_apple_audio.c b/src/io/source_apple_audio.c index 97d5b998..126058b8 100644 --- a/src/io/source_apple_audio.c +++ b/src/io/source_apple_audio.c @@ -96,8 +96,8 @@ uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, const char_ UInt32 propSize; if (s->path) AUBIO_FREE(s->path); - s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX)); - strncpy(s->path, path, strnlen(path, PATH_MAX)); + s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); + strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); // open the resource url CFURLRef fileURL = createURLFromPath(s->path); diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c index 3ab9a1f7..1d058f97 100644 --- a/src/io/source_avcodec.c +++ b/src/io/source_avcodec.c @@ -86,8 +86,8 @@ aubio_source_avcodec_t * new_aubio_source_avcodec(const char_t * path, uint_t sa s->channels = 1; if (s->path) AUBIO_FREE(s->path); - s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX)); - strncpy(s->path, path, strnlen(path, PATH_MAX)); + s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); + strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); // register all formats and codecs av_register_all(); diff --git a/src/io/source_sndfile.c b/src/io/source_sndfile.c index f69d2f6f..7f88e718 100644 --- a/src/io/source_sndfile.c +++ b/src/io/source_sndfile.c @@ -88,8 +88,8 @@ aubio_source_sndfile_t * new_aubio_source_sndfile(const char_t * path, uint_t sa s->channels = 1; if (s->path) AUBIO_FREE(s->path); - s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX)); - strncpy(s->path, path, strnlen(path, PATH_MAX)); + s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); + strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); // try opening the file, getting the info in sfinfo AUBIO_MEMSET(&sfinfo, 0, sizeof (sfinfo)); diff --git a/src/io/source_wavread.c b/src/io/source_wavread.c index 3dc3813c..d958fbee 100644 --- a/src/io/source_wavread.c +++ b/src/io/source_wavread.c @@ -87,8 +87,8 @@ aubio_source_wavread_t * new_aubio_source_wavread(const char_t * path, uint_t sa } if (s->path) AUBIO_FREE(s->path); - s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX)); - strncpy(s->path, path, strnlen(path, PATH_MAX)); + s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); + strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); s->samplerate = samplerate; s->hop_size = hop_size; -- 2.11.0