gnumeric r16395 - in branches/gnumeric-1-8: . plugins/applix

[mortenw svn gnome org]

Author: mortenw
Date: Thu Feb 21 02:19:04 2008
New Revision: 16395
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16395&view=rev

Log:
2008-02-20  Morten Welinder  <terra gnome org>

	* applix-read.c (applix_get_line): If we hit eof with nothing
	read, return NULL.  Callers appear to expect that.  Fixes #517778.




Modified:
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/plugins/applix/ChangeLog
   branches/gnumeric-1-8/plugins/applix/applix-read.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Thu Feb 21 02:19:04 2008
@@ -24,6 +24,7 @@
 	* Fix corrupted-qpro-bugs.  [#517144] [#517376] [#517591]
 	* Make <control>KP_Subtract work as <control>minus.  [#516358]
 	* Make <control>KP_Add work as <control>plus.
+	* Fix corrupted-applix-bug.  [#517778]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.1

Modified: branches/gnumeric-1-8/plugins/applix/applix-read.c
==============================================================================
--- branches/gnumeric-1-8/plugins/applix/applix-read.c	(original)
+++ branches/gnumeric-1-8/plugins/applix/applix-read.c	Thu Feb 21 02:19:04 2008
@@ -351,6 +351,9 @@
 			break;
 	}
 
+	if (offset == 0 && ptr == NULL)
+		return NULL;
+
 	if (state->buffer != NULL)
 		state->buffer [offset] = '\0';
 	return state->buffer;