bug#13925: ERRMAX in lib-src/pop.c

bug#13925: ERRMAX in lib-src/pop.c

[Martin von Gagern]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

Hi!

The file "lib-src/pop.c" refers to a macro "ERRMAX" which isn't declared
on my system. Judging from the commit which introduced it [1], I'd say
this should be ERROR_MAX instead.

[1]
http://bzr.savannah.gnu.org/lh/emacs/emacs-24/revision/109003/lib-src/pop.c#lib-src/pop.c

Greetings,
 Martin von Gagern


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

bug#13925: ERRMAX in lib-src/pop.c

[Glenn Morris]

Martin von Gagern wrote:

> The file "lib-src/pop.c" refers to a macro "ERRMAX" which isn't declared
> on my system. Judging from the commit which introduced it [1], I'd say
> this should be ERROR_MAX instead.

Congratulations, you found the deliberate mistake. :)

Please try at least a test build of a pretest next time. This issue
would have been obvious and easy to fix at any time during the past
several months of pretesting. Emacs can be built on so many systems
and in so many configurations that we rely on the help of pretesters
to test them.

bug#13925: ERRMAX in lib-src/pop.c

[Paul Eggert]

Sorry about the typo; it didn't trigger on my compilation platforms.

Here's the obvious patch.  Glenn, should I install this into
the emacs-24 branch or into the trunk?  I'm a bit fuzzy on
the branch status now that 24.3 has been released.

=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2013-03-11 02:35:23 +0000
+++ lib-src/ChangeLog	2013-03-12 19:57:55 +0000
@@ -1,3 +1,9 @@
+2013-03-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* pop.c: Fix ERRMAX typo (Bug#13925).
+	(socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]:
+	Use ERROR_MAX, not ERRMAX.
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
 	* Version 24.3 released.

=== modified file 'lib-src/pop.c'
--- lib-src/pop.c	2013-01-01 09:11:05 +0000
+++ lib-src/pop.c	2013-03-12 19:56:43 +0000
@@ -1198,7 +1198,7 @@
 	    }
 #elif defined HAVE_KRB5_ERROR_E_TEXT
 	  if (err_ret && err_ret->e_text && **err_ret->e_text)
-	    snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len,
+	    snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
 		      " [server says '%s']", *err_ret->e_text);
 #endif
 	  if (err_ret)

bug#13925: ERRMAX in lib-src/pop.c

[Glenn Morris]

Paul Eggert wrote:

> Here's the obvious patch.  Glenn, should I install this into
> the emacs-24 branch or into the trunk?  I'm a bit fuzzy on
> the branch status now that 24.3 has been released.

It is a totally safe fix, so emacs-24.

http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00058.html

My rule of thumb: if we had to release from emacs-24 tomorrow due to
some gaping security problem, am I happy to put this patch there today?

bug#13925: ERRMAX in lib-src/pop.c

[Paul Eggert]

On 03/12/13 14:57, Glenn Morris wrote:
> It is a totally safe fix, so emacs-24.

Thanks, installed as emacs-24 bzr 111329 and marking this as done.