[asterisk-commits] seanbright: branch 1.6.1 r161149 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Dec  4 20:52:37 2008
New Revision: 161149

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161149
Log:
Merged revisions 161147 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161147 | seanbright | 2008-12-04 21:47:54 -0500 (Thu, 04 Dec 2008) | 3 lines
  
  Check the return value of fread/fwrite so the compiler doesn't complain.  Only a
  problem when IMAP_STORAGE is enabled.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=161149&r1=161148&r2=161149
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Thu Dec  4 20:52:37 2008
@@ -1785,7 +1785,12 @@
 			*(vmu->email) = '\0';
 		return -1;
 	}
-	fread(buf, len, 1, p);
+	if (fread(buf, len, 1, p) < len) {
+		if (ferror(p)) {
+			ast_log(LOG_ERROR, "Short read while reading in mail file.\n");
+			return -1;
+		}
+	}
 	((char *)buf)[len] = '\0';
 	INIT(&str, mail_string, buf, len);
 	ret = init_mailstream(vms, NEW_FOLDER);
@@ -2132,7 +2137,11 @@
 	FILE *output;
 
 	output = fopen (filename, "w");
-	fwrite (buffer, len, 1, output);
+	if (fwrite(buffer, len, 1, output) < len) {
+		if (ferror(output)) {
+			ast_log(LOG_ERROR, "Short write while writing e-mail body.\n");
+		}
+	}
 	fclose (output);
 }