| Message ID | 1448901152-11716-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 30/11/2015 17:32, Markus Armbruster wrote: > We model all the non-deprecated memory allocation functions from > https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html > except for g_memdup(), g_clear_pointer(), g_steal_pointer(). We don't > use the latter two. Model the former. > > Coverity now reports an OVERRUN > vl.c:2317: alloc_strlen: Allocating insufficient memory for the terminating null of the string. > Correct, but we omit the terminating null intentionally there. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > scripts/coverity-model.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c > index 617f67d..e1d5f45 100644 > --- a/scripts/coverity-model.c > +++ b/scripts/coverity-model.c > @@ -236,6 +236,23 @@ void *g_try_realloc(void *ptr, size_t size) > return g_try_realloc_n(ptr, 1, size); > } > > +/* Other memory allocation functions */ > + > +void *g_memdup(const void *ptr, unsigned size) > +{ > + unsigned char *dup; > + unsigned i; > + > + if (!ptr) { > + return NULL; > + } > + > + dup = g_malloc(size); > + for (i = 0; i < size; i++) > + dup[i] = ((unsigned char *)ptr)[i]; > + return dup; > +} > + > /* > * GLib string allocation functions > */ > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c index 617f67d..e1d5f45 100644 --- a/scripts/coverity-model.c +++ b/scripts/coverity-model.c @@ -236,6 +236,23 @@ void *g_try_realloc(void *ptr, size_t size) return g_try_realloc_n(ptr, 1, size); } +/* Other memory allocation functions */ + +void *g_memdup(const void *ptr, unsigned size) +{ + unsigned char *dup; + unsigned i; + + if (!ptr) { + return NULL; + } + + dup = g_malloc(size); + for (i = 0; i < size; i++) + dup[i] = ((unsigned char *)ptr)[i]; + return dup; +} + /* * GLib string allocation functions */
We model all the non-deprecated memory allocation functions from https://developer.gnome.org/glib/stable/glib-Memory-Allocation.html except for g_memdup(), g_clear_pointer(), g_steal_pointer(). We don't use the latter two. Model the former. Coverity now reports an OVERRUN vl.c:2317: alloc_strlen: Allocating insufficient memory for the terminating null of the string. Correct, but we omit the terminating null intentionally there. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- scripts/coverity-model.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)