--- busybox-1.3.0/archival/libunarchive/get_header_ar.c	Wed Dec 13 01:09:51 2006
+++ busybox-1.3.0.dpkg_ar/archival/libunarchive/get_header_ar.c	Fri Dec 15 02:21:28 2006
@@ -9,6 +9,7 @@
 
 char get_header_ar(archive_handle_t *archive_handle)
 {
+	int err;
 	file_header_t *typed = archive_handle->file_header;
 	union {
 		char raw[60];
@@ -45,15 +46,23 @@
 	archive_handle->offset += 60;
 
 	/* align the headers based on the header magic */
-	if ((ar.formatted.magic[0] != '`') || (ar.formatted.magic[1] != '\n')) {
+	if (ar.formatted.magic[0] != '`' || ar.formatted.magic[1] != '\n')
 		bb_error_msg_and_die("invalid ar header");
-	}
 
-	typed->mode = xstrtoul(ar.formatted.mode, 8);
-	typed->mtime = xatou(ar.formatted.date);
-	typed->uid = xatou(ar.formatted.uid);
-	typed->gid = xatou(ar.formatted.gid);
-	typed->size = xatoul(ar.formatted.size);
+	/* FIXME: more thorough routine would be in order here */
+	/* (we have something like that in tar) */
+	/* but for now we are lax. This code works because */
+	/* on misformatted numbers bb_strtou returns all-ones */
+	typed->mode = err = bb_strtou(ar.formatted.mode, NULL, 8);
+	if (err == -1) bb_error_msg_and_die("invalid ar header");
+	typed->mtime = err = bb_strtou(ar.formatted.date, NULL, 10);
+	if (err == -1) bb_error_msg_and_die("invalid ar header");
+	typed->uid = err = bb_strtou(ar.formatted.uid, NULL, 10);
+	if (err == -1) bb_error_msg_and_die("invalid ar header");
+	typed->gid = err = bb_strtou(ar.formatted.gid, NULL, 10);
+	if (err == -1) bb_error_msg_and_die("invalid ar header");
+	typed->size = err = bb_strtou(ar.formatted.size, NULL, 10);
+	if (err == -1) bb_error_msg_and_die("invalid ar header");
 
 	/* long filenames have '/' as the first character */
 	if (ar.formatted.name[0] == '/') {
--- busybox-1.3.0/libbb/bb_strtonum.c	Wed Dec 13 01:09:55 2006
+++ busybox-1.3.0.dpkg_ar/libbb/bb_strtonum.c	Fri Dec 15 02:26:46 2006
@@ -17,6 +17,7 @@
  * errno = ERANGE if value had alphanumeric terminating char ("1234abcg").
  * errno = ERANGE if value is out of range, missing, etc.
  * errno = ERANGE if value had minus sign for strtouXX (even "-0" is not ok )
+ *    return value is all-ones in this case.
  */
 
 static unsigned long long ret_ERANGE(void)