git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extra tests: Test that valgrind and libtool are installed.
[libguestfs.git]
/
daemon
/
glob.c
diff --git
a/daemon/glob.c
b/daemon/glob.c
index
4fe76f3
..
ad8aa54
100644
(file)
--- a/
daemon/glob.c
+++ b/
daemon/glob.c
@@
-13,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc.,
675 Mass Ave, Cambridge, MA 02139,
USA.
+ * Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
*/
#include <config.h>
*/
#include <config.h>
@@
-40,13
+40,17
@@
do_glob_expand (const char *pattern)
char **rv;
rv = malloc (sizeof (char *) * 1);
char **rv;
rv = malloc (sizeof (char *) * 1);
+ if (rv == NULL) {
+ reply_with_perror ("malloc");
+ return NULL;
+ }
rv[0] = NULL;
return rv; /* Caller frees. */
}
if (r != 0) {
if (errno != 0)
rv[0] = NULL;
return rv; /* Caller frees. */
}
if (r != 0) {
if (errno != 0)
- reply_with_perror ("
glob:
%s", pattern);
+ reply_with_perror ("%s", pattern);
else
reply_with_error ("glob failed: %s", pattern);
return NULL;
else
reply_with_error ("glob failed: %s", pattern);
return NULL;