From 0966635873d0237c615aced5860802a8a953ff64 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 11 Sep 2009 00:45:13 +0000 Subject: * dln.c (aix_loaderror): get rid of using uninitialized value in the case loadquery fails. fixed wrong index variable usage. see [ruby-core:25479]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ dln.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8e0e19e49..03c64fbd5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 11 09:45:11 2009 Nobuyoshi Nakada + + * dln.c (aix_loaderror): get rid of using uninitialized value in the + case loadquery fails. fixed wrong index variable usage. see + [ruby-core:25479]. + Fri Sep 11 07:52:43 2009 NARUSE, Yui * unicode.c (onigenc_unicode_property_name_to_ctype): diff --git a/dln.c b/dln.c index b939dc3460..4837048138 100644 --- a/dln.c +++ b/dln.c @@ -1149,10 +1149,10 @@ dln_strerror(void) static void aix_loaderror(const char *pathname) { - char *message[8], errbuf[1024]; + char *message[1024], errbuf[1024]; int i,j; - struct errtab { + static const struct errtab { int errnum; char *errstr; } load_errtab[] = { @@ -1173,15 +1173,16 @@ aix_loaderror(const char *pathname) #define LOAD_ERRTAB_LEN (sizeof(load_errtab)/sizeof(load_errtab[0])) #define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1) - snprintf(errbuf, 1024, "load failed - %s ", pathname); + snprintf(errbuf, sizeof(errbuf), "load failed - %s ", pathname); - if (!loadquery(1, &message[0], sizeof(message))) + message[0] = NULL; + if (!loadquery(L_GETMESSAGE, &message[0], sizeof(message))) ERRBUF_APPEND(strerror(errno)); for(i = 0; message[i] && *message[i]; i++) { int nerr = atoi(message[i]); for (j=0; j