X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-stream-html-to-text.c;h=17a9eadc1ac2ee6407e177eca14dc684aaf44b90;hp=4a0f609c7c6bc3e2aefeb4d0a559cec425275d23;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=2b9e7e38efa0dd92459a4658cf354fb43239bb74

diff --git a/src/modest-stream-html-to-text.c b/src/modest-stream-html-to-text.c
index 4a0f609..17a9ead 100644
--- a/src/modest-stream-html-to-text.c
+++ b/src/modest-stream-html-to-text.c
@@ -193,12 +193,14 @@ static ssize_t
 html_to_text_read (TnyStream *self, char *buffer, size_t n)
 {
 	ModestStreamHtmlToTextPrivate *priv;
-	gint i;
+	gint i = 0;
 
 	priv = MODEST_STREAM_HTML_TO_TEXT_GET_PRIVATE (self);
 
-	for (i = 0; (i < n) && ((priv->position + i) < priv->buffer->len) ; i++)
-		buffer[i] = priv->buffer->str[priv->position + i];
+	if (priv->buffer) {
+		for (i = 0; (i < n) && ((priv->position + i) < priv->buffer->len) ; i++)
+			buffer[i] = priv->buffer->str[priv->position + i];
+	}
 
 	priv->position += i;
 
@@ -240,7 +242,11 @@ html_to_text_is_eos (TnyStream *self)
 
 	priv = MODEST_STREAM_HTML_TO_TEXT_GET_PRIVATE(self);
 
-	return (priv->position >= (priv->buffer->len - 1));
+	/* This could happen if the body is empty */
+	if (!priv->buffer)
+		return TRUE;
+	else
+		return (priv->position >= (priv->buffer->len - 1));
 }