Author: rjung
Date: Tue Apr 1 16:10:55 2014
New Revision: 1583726
URL: http://svn.apache.org/r1583726
Log:
BZ 55696: Fix crash on Mac OS X 10.9 during config
parsing.
Modified:
tomcat/jk/trunk/native/common/jk_map.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_map.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_map.c?rev=1583726&r1=1583725&r2=1583726&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_map.c (original)
+++ tomcat/jk/trunk/native/common/jk_map.c Tue Apr 1 16:10:55 2014
@@ -206,29 +206,27 @@ int jk_map_get_int(jk_map_t *m, const ch
const char *rc;
size_t len;
int int_res;
- int multit = 1;
sprintf(buf, "%d", def);
rc = jk_map_get_string(m, name, buf);
len = strlen(rc);
if (len) {
- char *lastchar = &buf[0] + len - 1;
- strcpy(buf, rc);
+ const char *lastchar = &rc[0] + len - 1;
+ int multit = 1;
if ('m' == *lastchar || 'M' == *lastchar) {
- *lastchar = '\0';
multit = 1024 * 1024;
}
else if ('k' == *lastchar || 'K' == *lastchar) {
- *lastchar = '\0';
multit = 1024;
}
- int_res = atoi(buf);
+ /* Safe because atoi() will stop at any non-numeric lastchar */
+ int_res = atoi(rc) * multit;
}
else
int_res = def;
- return int_res * multit;
+ return int_res;
}
double jk_map_get_double(jk_map_t *m, const char *name, double def)
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1583726&r1=1583725&r2=1583726&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Apr 1 16:10:55 2014
@@ -57,6 +57,10 @@
<fix>
<bug>53542</bug>: ISAPI: Fix grammar in 503 error page. (rjung)
</fix>
+ <fix>
+ <bug>55696</bug>: Crash on Mac OS X 10.9 during config parsing.
+ (rjung)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
