about summary refs log tree commit diff
path: root/locale/programs/ld-address.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-05 13:37:35 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-05 13:37:35 +0000
commitfff04b32afcf55edd678f7635a70f8918c4a0bd9 (patch)
tree6e1827fe0ef244487cc8757014639a4b8834da2a /locale/programs/ld-address.c
parentf2d5cf5005abf48aeaf4e7e8093aa49f32c76756 (diff)
downloadglibc-fff04b32afcf55edd678f7635a70f8918c4a0bd9.tar.gz
glibc-fff04b32afcf55edd678f7635a70f8918c4a0bd9.tar.xz
glibc-fff04b32afcf55edd678f7635a70f8918c4a0bd9.zip
2006-05-05  Jakub Jelinek  <jakub@redhat.com>
	[BZ #2509]
	* stdio-common/tst-printf.sh: Adjust for tst-printf.c change even
	on 32-bit arches.

2006-05-05  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/ld-address.c (address_finish): Fix one more
	place where the iso639 array might be access beyond the limits.
Diffstat (limited to 'locale/programs/ld-address.c')
-rw-r--r--locale/programs/ld-address.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c
index 83cd9fa17b..dac8551071 100644
--- a/locale/programs/ld-address.c
+++ b/locale/programs/ld-address.c
@@ -237,7 +237,8 @@ No definition for %s category found"), "LC_ADDRESS"));
 	WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be empty"),
 				"LC_ADDRESS", "lang_ab"));
     }
-  else if (iso639[cnt].ab[0] == '\0')
+  else if (cnt < sizeof (iso639) / sizeof (iso639[0])
+	   && iso639[cnt].ab[0] == '\0')
     {
       WITH_CUR_LOCALE (error (0, 0, _("%s: field `%s' must not be defined"),
 			      "LC_ADDRESS", "lang_ab"));