shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

Fix a malloc error path in dmsetup message.

Browse Source
This commit is contained in:
Alasdair Kergon 2007-01-15 22:05:50 +00:00
parent b1ab8b00b8
commit 528329f199
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.15 - Version 1.02.15 -
=================================== ===================================
Fix a malloc error path in dmsetup message.
More libdevmapper-event interface changes and fixes. More libdevmapper-event interface changes and fixes.
Rename dm_saprintf() to dm_asprintf(). Rename dm_saprintf() to dm_asprintf().
Report error if NULL pointer is supplied to dm_strdup_aux(). Report error if NULL pointer is supplied to dm_strdup_aux().

11
daemons/dmeventd/dmeventd.c
View File

@ -29,22 +29,11 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <libgen.h>
#include <pthread.h> #include <pthread.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/resource.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h>
#include <arpa/inet.h> /* for htonl, ntohl */ #include <arpa/inet.h> /* for htonl, ntohl */
#ifdef linux #ifdef linux

6
tools/dmsetup.c
View File

@ -533,7 +533,11 @@ static int _message(int argc, char **argv, void *data __attribute((unused)))
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
sz += strlen(argv[i]) + 1; sz += strlen(argv[i]) + 1;
str = dm_malloc(sz); if (!(str = dm_malloc(sz))) {
err("message string allocation failed");
goto out;
}
memset(str, 0, sz); memset(str, 0, sz);
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {