projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
libtest: fix UB with va_start()
[awesomized/libmemcached]
/
clients
/
memcp.cc
diff --git
a/clients/memcp.cc
b/clients/memcp.cc
index 1551a1d50b3109d338a5d5c9ab0800b3de6f6ac9..d76faeecca8d31da36e6f23d2ebec9a3e1ea813d 100644
(file)
--- a/
clients/memcp.cc
+++ b/
clients/memcp.cc
@@
-1,5
+1,5
@@
/* LibMemcached
/* LibMemcached
- * Copyright (C) 2011-201
2
Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011-201
3
Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
@@
-68,13
+68,13
@@
static long strtol_wrapper(const char *nptr, int base, bool *error)
or (errno != 0 && val == 0))
{
*error= true;
or (errno != 0 && val == 0))
{
*error= true;
- return
EXIT_SUCCESS
;
+ return
0
;
}
if (endptr == nptr)
{
*error= true;
}
if (endptr == nptr)
{
*error= true;
- return
EXIT_SUCCESS
;
+ return
0
;
}
*error= false;
}
*error= false;
@@
-85,6
+85,13
@@
int main(int argc, char *argv[])
{
options_parse(argc, argv);
{
options_parse(argc, argv);
+
+ if (optind >= argc)
+ {
+ fprintf(stderr, "Expected argument after options\n");
+ exit(EXIT_FAILURE);
+ }
+
initialize_sockets();
memcached_st *memc= memcached_create(NULL);
initialize_sockets();
memcached_st *memc= memcached_create(NULL);
@@
-129,21
+136,25
@@
int main(int argc, char *argv[])
{
opt_servers= strdup(temp);
}
{
opt_servers= strdup(temp);
}
- else
+#if 0
+ else if (argc >= 1 and argv[--argc])
+ {
+ opt_servers= strdup(argv[argc]);
+ }
+#endif
+
+ if (opt_servers == NULL)
{
std::cerr << "No Servers provided" << std::endl;
exit(EXIT_FAILURE);
}
}
{
std::cerr << "No Servers provided" << std::endl;
exit(EXIT_FAILURE);
}
}
- memcached_server_st *servers;
- if (opt_servers)
- {
- servers= memcached_servers_parse(opt_servers);
- }
- else
+ memcached_server_st* servers= memcached_servers_parse(opt_servers);
+ if (servers == NULL or memcached_server_list_count(servers) == 0)
{
{
- servers= memcached_servers_parse(argv[--argc]);
+ std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
+ return EXIT_FAILURE;
}
memcached_server_push(memc, servers);
}
memcached_server_push(memc, servers);
@@
-183,7
+194,13
@@
int main(int argc, char *argv[])
}
struct stat sbuf;
}
struct stat sbuf;
- (void)fstat(fd, &sbuf);
+ if (fstat(fd, &sbuf) == -1)
+ {
+ std::cerr << "memcp " << argv[optind] << " " << strerror(errno) << std::endl;
+ optind++;
+ exit_code= EXIT_FAILURE;
+ continue;
+ }
char *ptr= rindex(argv[optind], '/');
if (ptr)
char *ptr= rindex(argv[optind], '/');
if (ptr)
@@
-204,27
+221,33
@@
int main(int argc, char *argv[])
ptr, opt_flags, (unsigned long)opt_expires);
}
ptr, opt_flags, (unsigned long)opt_expires);
}
- char *file_buffer_ptr;
- if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL)
+ // The file may be empty
+ char *file_buffer_ptr= NULL;
+ if (sbuf.st_size > 0)
{
{
- std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl;
- close(fd);
- exit(EXIT_FAILURE);
- }
+ if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL)
+ {
+ std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl;
+ close(fd);
+ exit(EXIT_FAILURE);
+ }
- ssize_t read_length;
- if ((read_length= ::read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1)
- {
- std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl;
- close(fd);
- exit(EXIT_FAILURE);
- }
+ ssize_t read_length;
+ if ((read_length= ::read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1)
+ {
+ std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl;
+ close(fd);
+ free(file_buffer_ptr);
+ exit(EXIT_FAILURE);
+ }
- if (read_length != sbuf.st_size)
- {
- std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl;
- close(fd);
- exit(EXIT_FAILURE);
+ if (read_length != sbuf.st_size)
+ {
+ std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl;
+ close(fd);
+ free(file_buffer_ptr);
+ exit(EXIT_FAILURE);
+ }
}
memcached_return_t rc;
}
memcached_return_t rc;
@@
-362,10
+385,10
@@
static void options_parse(int argc, char *argv[])
case OPT_EXPIRE: /* --expire */
{
bool strtol_error;
case OPT_EXPIRE: /* --expire */
{
bool strtol_error;
- opt_expires= (time_t)strtol_wrapper(optarg, 1
6
, &strtol_error);
+ opt_expires= (time_t)strtol_wrapper(optarg, 1
0
, &strtol_error);
if (strtol_error == true)
{
if (strtol_error == true)
{
- fprintf(stderr, "Bad value passed via --
flag
\n");
+ fprintf(stderr, "Bad value passed via --
expire
\n");
exit(1);
}
}
exit(1);
}
}