2 files changed, 9 insertions, 0 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 479c4f764f..32cc34b225 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1013,6 +1013,10 @@ static void do_put(char *rname,char *lname)
 		 rname));
   
 	buf = (char *)malloc(maxwrite);
+	if (!buf) {
+		DEBUG(0, ("ERROR: Not enough memory!\n"));
+		return;
+	}
 	while (!feof(f)) {
 		int n = maxwrite;
 		int ret;
diff --git a/source3/client/smbumount.c b/source3/client/smbumount.c
index dacf4ab67d..983ad44fa0 100644
--- a/source3/client/smbumount.c
+++ b/source3/client/smbumount.c
@@ -74,6 +74,11 @@ canonicalize (char *path)
 {
 	char *canonical = malloc (PATH_MAX + 1);
 
+	if (!canonical) {
+		fprintf(stderr, "Error! Not enough memory!\n");
+		return NULL;
+	}
+
 	if (strlen(path) > PATH_MAX) {
 		fprintf(stderr, "Mount point string too long\n");
 		return NULL;