Attachment #20524 for bug #54773

View | Details | Raw Unified | Return to bug 54773
Collapse All | Expand All

Lines 1-3 Link Here

(-)ChangeLog (+6 lines)
		1	2004-05-28 Derek Price <derek@ximbiot.com>
		2
		3	* NEWS: Note Stefan & Sebastian's security fixes.
		4	* acinclude.m4 (gl_SIZE_MAX, gl_XSIZE): Import from GNULIB.
		5	* configure.in: Call gl_XSIZE.
		6
1	2004-05-19 Derek Price <derek@ximbiot.com>	7	2004-05-19 Derek Price <derek@ximbiot.com>
2		8
3	* NEWS: Note CAN-2004-0396 fix.	9	* NEWS: Note CAN-2004-0396 fix.

Lines 1-6 Link Here

(-)NEWS (+8 lines)
1	Changes since 1.11.16:	1	Changes since 1.11.16:
2	**********************	2	**********************
3		3
		4	SERVER SECURITY FIXES
		5
		6	* Thanks to Stefan Esser & Sebastian Krahmer, several potential security
		7	problems have been fixed. The ones which were considered dangerous enough
		8	to catalogue were assigned issue numbers CAN-2004-0416, CAN-2004-0417, &
		9	CAN-2004-0418 by the Common Vulnerabilities and Exposures Project. Please
		10	see <http://www.cve.mitre.org> for more information.
		11
4	Changes from 1.11.15 to 1.11.16:	12	Changes from 1.11.15 to 1.11.16:
5	********************************	13	********************************
6		14




  AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi])
fi
])dnl



# size_max.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License.  As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.

dnl From Bruno Haible.

AC_DEFUN([gl_SIZE_MAX],
[
  AC_CHECK_HEADERS(stdint.h)
  dnl First test whether the system already has SIZE_MAX.
  AC_MSG_CHECKING([for SIZE_MAX])
  result=
  AC_EGREP_CPP([Found it], [
#include <limits.h>
#if HAVE_STDINT_H
#include <stdint.h>
#endif
#ifdef SIZE_MAX
Found it
#endif
], result=yes)
  if test -z "$result"; then
    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
    dnl than the type 'unsigned long'.
    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
      [#include <stddef.h>], result=?)
    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
      [#include <stddef.h>], result=?)
    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
      [#include <stddef.h>], result=?)
    if test "$fits_in_uint" = 1; then
      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
      AC_TRY_COMPILE([#include <stddef.h>
        extern size_t foo;
        extern unsigned long foo;
        ], [], fits_in_uint=0)
    fi
    if test -z "$result"; then
      if test "$fits_in_uint" = 1; then
        result="$res_hi$res_lo"U
      else
        result="$res_hi$res_lo"UL
      fi
    else
      dnl Shouldn't happen, but who knows...
      result='~(size_t)0'
    fi
  fi
  AC_MSG_RESULT([$result])
  if test "$result" != yes; then
    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
  fi
])



# xsize.m4 serial 3
dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License.  As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.

AC_DEFUN([gl_XSIZE],
[
  dnl Prerequisites of lib/xsize.h.
  AC_REQUIRE([gl_SIZE_MAX])
  AC_REQUIRE([AC_C_INLINE])
  AC_CHECK_HEADERS(stdint.h)
])




fi
])dnl



# size_max.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License.  As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.

dnl From Bruno Haible.

AC_DEFUN([gl_SIZE_MAX],
[
  AC_CHECK_HEADERS(stdint.h)
  dnl First test whether the system already has SIZE_MAX.
  AC_MSG_CHECKING([for SIZE_MAX])
  result=
  AC_EGREP_CPP([Found it], [
#include <limits.h>
#if HAVE_STDINT_H
#include <stdint.h>
#endif
#ifdef SIZE_MAX
Found it
#endif
], result=yes)
  if test -z "$result"; then
    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
    dnl than the type 'unsigned long'.
    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
      [#include <stddef.h>], result=?)
    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
      [#include <stddef.h>], result=?)
    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
      [#include <stddef.h>], result=?)
    if test "$fits_in_uint" = 1; then
      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
      AC_TRY_COMPILE([#include <stddef.h>
        extern size_t foo;
        extern unsigned long foo;
        ], [], fits_in_uint=0)
    fi
    if test -z "$result"; then
      if test "$fits_in_uint" = 1; then
        result="$res_hi$res_lo"U
      else
        result="$res_hi$res_lo"UL
      fi
    else
      dnl Shouldn't happen, but who knows...
      result='~(size_t)0'
    fi
  fi
  AC_MSG_RESULT([$result])
  if test "$result" != yes; then
    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
  fi
])



# xsize.m4 serial 3
dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License.  As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.

AC_DEFUN([gl_XSIZE],
[
  dnl Prerequisites of lib/xsize.h.
  AC_REQUIRE([gl_SIZE_MAX])
  AC_REQUIRE([AC_C_INLINE])
  AC_CHECK_HEADERS(stdint.h)
])

# Do all the work for Automake.                            -*- Autoconf -*-

# This macro actually does too much some checks are only needed if

Lines 425-430 Link Here

(-)config.h.in (+10 lines)
425	*/	425	*/
426	#undef SERVER_SUPPORT	426	#undef SERVER_SUPPORT
427		427
		428	/* Define as the maximum value of type 'size_t', if the system doesn't define
		429	it. */
		430	#undef SIZE_MAX
		431
428	/* Define to 1 if the `S_IS' macros in <sys/stat.h> do not work properly. /	432	/* Define to 1 if the `S_IS' macros in <sys/stat.h> do not work properly. /
429	#undef STAT_MACROS_BROKEN	433	#undef STAT_MACROS_BROKEN
430		434
Lines 486-491 Link Here
486	/* Define to `int' if <sys/types.h> doesn't define. */	490	/* Define to `int' if <sys/types.h> doesn't define. */
487	#undef gid_t	491	#undef gid_t
488		492
		493	/* Define to `__inline__' or `__inline' if that's what the C compiler
		494	calls it, or to nothing if 'inline' is not supported under any name. */
		495	#ifndef __cplusplus
		496	#undef inline
		497	#endif
		498
489	/* Define to `int' if <sys/types.h> does not define. */	499	/* Define to `int' if <sys/types.h> does not define. */
490	#undef mode_t	500	#undef mode_t
491		501







for ac_header in stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
  # Is the header compilable?
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_header_compiler=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_header_compiler=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6

# Is the header present?
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
  else
    ac_cpp_err=
  fi
else
  ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
  ac_header_preproc=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

  ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
    ac_header_preproc=yes
    ;;
  no:yes:* )
    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
    (
      cat <<\_ASBOX
## ------------------------------ ##
## Report this to bug-cvs@gnu.org ##
## ------------------------------ ##
_ASBOX
    ) |
      sed "s/^/$as_me: WARNING:     /" >&2
    ;;
esac
echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
  cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF

fi

done

    echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
  result=
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */

#include <limits.h>
#if HAVE_STDINT_H
#include <stdint.h>
#endif
#ifdef SIZE_MAX
Found it
#endif

_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  $EGREP "Found it" >/dev/null 2>&1; then
  result=yes
fi
rm -f conftest*

  if test -z "$result"; then
                    if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo=`expr $ac_mid + 1`
		    if test $ac_lo -le $ac_mid; then
		      ac_lo= ac_hi=
		      break
		    fi
		    ac_mid=`expr 2 '*' $ac_mid + 1`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_hi=`expr '(' $ac_mid ')' - 1`
		       if test $ac_mid -le $ac_hi; then
			 ac_lo= ac_hi=
			 break
		       fi
		       ac_mid=`expr 2 '*' $ac_mid`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo= ac_hi=
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo=`expr '(' $ac_mid ')' + 1`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) res_hi=$ac_lo;;
'') result=? ;;
esac
else
  if test "$cross_compiling" = yes; then
  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
   { (exit 1); exit 1; }; }
else
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
long longval () { return ~(size_t)0 / 10; }
unsigned long ulongval () { return ~(size_t)0 / 10; }
#include <stdio.h>
#include <stdlib.h>
int
main ()
{

  FILE *f = fopen ("conftest.val", "w");
  if (! f)
    exit (1);
  if ((~(size_t)0 / 10) < 0)
    {
      long i = longval ();
      if (i != (~(size_t)0 / 10))
	exit (1);
      fprintf (f, "%ld\n", i);
    }
  else
    {
      unsigned long i = ulongval ();
      if (i != (~(size_t)0 / 10))
	exit (1);
      fprintf (f, "%lu\n", i);
    }
  exit (ferror (f) || fclose (f) != 0);

  ;
  return 0;
}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  res_hi=`cat conftest.val`
else
  echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

( exit $ac_status )
result=?
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
rm -f conftest.val
    if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo=`expr $ac_mid + 1`
		    if test $ac_lo -le $ac_mid; then
		      ac_lo= ac_hi=
		      break
		    fi
		    ac_mid=`expr 2 '*' $ac_mid + 1`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_hi=`expr '(' $ac_mid ')' - 1`
		       if test $ac_mid -le $ac_hi; then
			 ac_lo= ac_hi=
			 break
		       fi
		       ac_mid=`expr 2 '*' $ac_mid`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo= ac_hi=
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo=`expr '(' $ac_mid ')' + 1`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) res_lo=$ac_lo;;
'') result=? ;;
esac
else
  if test "$cross_compiling" = yes; then
  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
   { (exit 1); exit 1; }; }
else
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
long longval () { return ~(size_t)0 % 10; }
unsigned long ulongval () { return ~(size_t)0 % 10; }
#include <stdio.h>
#include <stdlib.h>
int
main ()
{

  FILE *f = fopen ("conftest.val", "w");
  if (! f)
    exit (1);
  if ((~(size_t)0 % 10) < 0)
    {
      long i = longval ();
      if (i != (~(size_t)0 % 10))
	exit (1);
      fprintf (f, "%ld\n", i);
    }
  else
    {
      unsigned long i = ulongval ();
      if (i != (~(size_t)0 % 10))
	exit (1);
      fprintf (f, "%lu\n", i);
    }
  exit (ferror (f) || fclose (f) != 0);

  ;
  return 0;
}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  res_lo=`cat conftest.val`
else
  echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

( exit $ac_status )
result=?
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
rm -f conftest.val
    if test "$cross_compiling" = yes; then
  # Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=0 ac_mid=0
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid; break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo=`expr $ac_mid + 1`
		    if test $ac_lo -le $ac_mid; then
		      ac_lo= ac_hi=
		      break
		    fi
		    ac_mid=`expr 2 '*' $ac_mid + 1`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=-1 ac_mid=-1
  while :; do
    cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_lo=$ac_mid; break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_hi=`expr '(' $ac_mid ')' - 1`
		       if test $ac_mid -le $ac_hi; then
			 ac_lo= ac_hi=
			 break
		       fi
		       ac_mid=`expr 2 '*' $ac_mid`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo= ac_hi=
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
int
main ()
{
static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
test_array [0] = 0

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_hi=$ac_mid
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_lo=`expr '(' $ac_mid ')' + 1`
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
?*) fits_in_uint=$ac_lo;;
'') result=? ;;
esac
else
  if test "$cross_compiling" = yes; then
  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
See \`config.log' for more details." >&2;}
   { (exit 1); exit 1; }; }
else
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
#include <stdio.h>
#include <stdlib.h>
int
main ()
{

  FILE *f = fopen ("conftest.val", "w");
  if (! f)
    exit (1);
  if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
    {
      long i = longval ();
      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
	exit (1);
      fprintf (f, "%ld\n", i);
    }
  else
    {
      unsigned long i = ulongval ();
      if (i != (sizeof (size_t) <= sizeof (unsigned int)))
	exit (1);
      fprintf (f, "%lu\n", i);
    }
  exit (ferror (f) || fclose (f) != 0);

  ;
  return 0;
}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  (eval $ac_link) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  fits_in_uint=`cat conftest.val`
else
  echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

( exit $ac_status )
result=?
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
rm -f conftest.val
    if test "$fits_in_uint" = 1; then
                  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <stddef.h>
        extern size_t foo;
        extern unsigned long foo;

int
main ()
{

  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  fits_in_uint=0
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    fi
    if test -z "$result"; then
      if test "$fits_in_uint" = 1; then
        result="$res_hi$res_lo"U
      else
        result="$res_hi$res_lo"UL
      fi
    else
            result='~(size_t)0'
    fi
  fi
  echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6
  if test "$result" != yes; then

cat >>confdefs.h <<_ACEOF
#define SIZE_MAX $result
_ACEOF

  fi

echo "$as_me:$LINENO: checking for inline" >&5
echo $ECHO_N "checking for inline... $ECHO_C" >&6
if test "${ac_cv_c_inline+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
  cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#ifndef __cplusplus
typedef int foo_t;
static $ac_kw foo_t static_foo () {return 0; }
$ac_kw foo_t foo () {return 0; }
#endif

_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_c_inline=$ac_kw; break
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done

fi
echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
echo "${ECHO_T}$ac_cv_c_inline" >&6


case $ac_cv_c_inline in
  inline | yes) ;;
  *)
    case $ac_cv_c_inline in
      no) ac_val=;;
      *) ac_val=$ac_cv_c_inline;;
    esac
    cat >>confdefs.h <<_ACEOF
#ifndef __cplusplus
#define inline $ac_val
#endif
_ACEOF
    ;;
esac





for ac_header in stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
  # Is the header compilable?
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"
			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_header_compiler=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_header_compiler=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6

# Is the header present?
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
  else
    ac_cpp_err=
  fi
else
  ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
  ac_header_preproc=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

  ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
    ac_header_preproc=yes
    ;;
  no:yes:* )
    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
    (
      cat <<\_ASBOX
## ------------------------------ ##
## Report this to bug-cvs@gnu.org ##
## ------------------------------ ##
_ASBOX
    ) |
      sed "s/^/$as_me: WARNING:     /" >&2
    ;;
esac
echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
  cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF

fi

done




cat >>confdefs.h <<\_ACEOF
#define getpass cvs_getpass
_ACEOF

Lines 191-196 AC_REPLACE_FUNCS(\ Link Here

(-)configure.in (+1 lines)
191	dnl	191	dnl
192	dnl Begin GNULIB stuff.	192	dnl Begin GNULIB stuff.
193	dnl	193	dnl
		194	gl_XSIZE
194		195
195	dnl We always want to use the GNULIB getpass, so define its name to something	196	dnl We always want to use the GNULIB getpass, so define its name to something
196	dnl that won't conflict with system declarations.	197	dnl that won't conflict with system declarations.

Lines 1-3 Link Here

(-)lib/ChangeLog (+5 lines)
		1	2004-05-28 Derek Price <derek@ximbiot.com>
		2
		3	* xsize.h: New file from GNULIB.
		4	* Makefile.am (libcvs_a_SOURCES): Add xsize.h.
		5
1	2004-05-15 Derek Price <derek@ximbiot.com>	6	2004-05-15 Derek Price <derek@ximbiot.com>
2		7
3	* libcvs.dsp: Header file list updated.	8	* libcvs.dsp: Header file list updated.

Lines 88-93 EXTRA_DIST = \ Link Here

(-)lib/Makefile.am (+3 lines)
88	libcvs.dep libcvs.dsp libcvs.mak \	88	libcvs.dep libcvs.dsp libcvs.mak \
89	xgssapi.h	89	xgssapi.h
90		90
		91	# For the xsize module from GNULIB.
		92	libcvs_a_SOURCES += xsize.h
		93
91	# Until Automake gets its act together	94	# Until Automake gets its act together
92	distclean-local:	95	distclean-local:
93	rm -f fnmatch.h	96	rm -f fnmatch.h

Lines 166-171 noinst_LIBRARIES = libcvs.a Link Here

(-)lib/Makefile.in (-2 / +4 lines)
166	# Also should look into unifying regular expression matching in CVS	166	# Also should look into unifying regular expression matching in CVS
167	# with the diff library (perhaps to have the caller, CVS, do the	167	# with the diff library (perhaps to have the caller, CVS, do the
168	# matching?)	168	# matching?)
		169
		170	# For the xsize module from GNULIB.
169	libcvs_a_SOURCES = \	171	libcvs_a_SOURCES = \
170	argmatch.c \	172	argmatch.c \
171	getdate.y \	173	getdate.y \
Lines 189-196 libcvs_a_SOURCES = \ Link Here
189	system.h \	191	system.h \
190	wait.h \	192	wait.h \
191	xselect.h \	193	xselect.h \
192	xtime.h	194	xtime.h\
193		195	xsize.h
194	libcvs_a_LIBADD = @LIBOBJS@	196	libcvs_a_LIBADD = @LIBOBJS@
195		197
196	EXTRA_DIST = \	198	EXTRA_DIST = \




/* xsize.h -- Checked size_t computations.

   Copyright (C) 2003 Free Software Foundation, Inc.

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

#ifndef _XSIZE_H
#define _XSIZE_H

/* Get size_t.  */
#include <stddef.h>

/* Get SIZE_MAX.  */
#include <limits.h>
#if HAVE_STDINT_H
# include <stdint.h>
#endif

/* The size of memory objects is often computed through expressions of
   type size_t. Example:
      void* p = malloc (header_size + n * element_size).
   These computations can lead to overflow.  When this happens, malloc()
   returns a piece of memory that is way too small, and the program then
   crashes while attempting to fill the memory.
   To avoid this, the functions and macros in this file check for overflow.
   The convention is that SIZE_MAX represents overflow.
   malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
   implementation that uses mmap --, it's recommended to use size_overflow_p()
   or size_in_bounds_p() before invoking malloc().
   The example thus becomes:
      size_t size = xsum (header_size, xtimes (n, element_size));
      void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
*/

/* Convert an arbitrary value >= 0 to type size_t.  */
#define xcast_size_t(N) \
  ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)

/* Sum of two sizes, with overflow check.  */
static inline size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
xsum (size_t size1, size_t size2)
{
  size_t sum = size1 + size2;
  return (sum >= size1 ? sum : SIZE_MAX);
}

/* Sum of three sizes, with overflow check.  */
static inline size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
xsum3 (size_t size1, size_t size2, size_t size3)
{
  return xsum (xsum (size1, size2), size3);
}

/* Sum of four sizes, with overflow check.  */
static inline size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
{
  return xsum (xsum (xsum (size1, size2), size3), size4);
}

/* Maximum of two sizes, with overflow check.  */
static inline size_t
#if __GNUC__ >= 3
__attribute__ ((__pure__))
#endif
xmax (size_t size1, size_t size2)
{
  /* No explicit check is needed here, because for any n:
     max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX.  */
  return (size1 >= size2 ? size1 : size2);
}

/* Multiplication of a count with an element size, with overflow check.
   The count must be >= 0 and the element size must be > 0.
   This is a macro, not an inline function, so that it works correctly even
   when N is of a wider tupe and N > SIZE_MAX.  */
#define xtimes(N, ELSIZE) \
  ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)

/* Check for overflow.  */
#define size_overflow_p(SIZE) \
  ((SIZE) == SIZE_MAX)
/* Check against overflow.  */
#define size_in_bounds_p(SIZE) \
  ((SIZE) != SIZE_MAX)

#endif /* _XSIZE_H */




2004-05-28  Derek Price  <derek@ximbiot.com>

	* commit.c, filesubr.c, history.c, server.c, wrapper.c: Various
	security fixes.
	(Original patch from Stefan Essler <s.esser@e-matters.de> & Sebastian
	Krahmer <krahmer@suse.de>.)

	* cvs.h: Include xsize.h.

2004-05-19  Derek Price  <derek@ximbiot.com>

	* server.c (serve_unchanged, serve_is_modified): Overwrite existing

Lines 523-529 commit (argc, argv) Link Here

(-)src/commit.c (-1 / +6 lines)
523	operate on, and only work with those files in the future.	523	operate on, and only work with those files in the future.
524	This saves time--we don't want to search the file system	524	This saves time--we don't want to search the file system
525	of the working directory twice. */	525	of the working directory twice. */
526	find_args.argv = (char *) xmalloc (find_args.argc sizeof (char **));	526	if (size_overflow_p (xtimes (find_args.argc, sizeof (char **))))
		527	{
		528	find_args.argc = 0;
		529	return 0;
		530	}
		531	find_args.argv = xmalloc (xtimes (find_args.argc, sizeof (char **)));
527	find_args.argc = 0;	532	find_args.argc = 0;
528	walklist (find_args.ulist, copy_ulist, &find_args);	533	walklist (find_args.ulist, copy_ulist, &find_args);
529		534

Lines 40-45 Link Here

(-)src/cvs.h (+4 lines)
40	#include "popen.h"	40	#include "popen.h"
41	#endif	41	#endif
42		42
		43	/* Begin GNULIB headers. */
		44	#include "xsize.h"
		45	/* End GNULIB headers. */
		46
43	#ifdef STDC_HEADERS	47	#ifdef STDC_HEADERS
44	#include <stdlib.h>	48	#include <stdlib.h>
45	#else	49	#else

Lines 1029-1036 expand_wild (argc, argv, pargc, pargv) Link Here

(-)src/filesubr.c (-1 / +7 lines)
1029	char ***pargv;	1029	char ***pargv;
1030	{	1030	{
1031	int i;	1031	int i;
		1032	if (size_overflow_p (xtimes (argc, sizeof (char *)))) {
		1033	*pargc = 0;
		1034	*pargv = NULL;
		1035	error (0, 0, "expand_wild: too many arguments");
		1036	return;
		1037	}
1032	*pargc = argc;	1038	*pargc = argc;
1033	pargv = (char ) xmalloc (argc sizeof (char *));	1039	pargv = xmalloc (xtimes (argc, sizeof (char )));
1034	for (i = 0; i < argc; ++i)	1040	for (i = 0; i < argc; ++i)
1035	(*pargv)[i] = xstrdup (argv[i]);	1041	(*pargv)[i] = xstrdup (argv[i]);
1036	}	1042	}

Lines 416-423 history (argc, argv) Link Here

(-)src/history.c (-9 / +24 lines)
416	working = 1;	416	working = 1;
417	break;	417	break;
418	case 'X': /* Undocumented debugging flag */	418	case 'X': /* Undocumented debugging flag */
		419	#ifdef DEBUG
419	histfile = optarg;	420	histfile = optarg;
		421	#endif
420	break;	422	break;
		423
421	case 'D': /* Since specified date */	424	case 'D': /* Since specified date */
422	if (since_rev \|\| since_tag \|\| *backto)	425	if (since_rev \|\| since_tag \|\| *backto)
423	{	426	{
Lines 906-914 save_user (name) Link Here
906	{	909	{
907	if (user_count == user_max)	910	if (user_count == user_max)
908	{	911	{
909	user_max += USER_INCREMENT;	912	user_max = xsum (user_max, USER_INCREMENT);
910	user_list = (char *) xrealloc ((char ) user_list,	913	if (size_overflow_p (xtimes (user_max, sizeof (char *))))
911	(int) user_max * sizeof (char *));	914	{
		915	error (0, 0, "save_user: too many users");
		916	return;
		917	}
		918	user_list = xrealloc (user_list, xtimes (user_max, sizeof (char *)));
912	}	919	}
913	user_list[user_count++] = xstrdup (name);	920	user_list[user_count++] = xstrdup (name);
914	}	921	}
Lines 936-944 save_file (dir, name, module) Link Here
936		943
937	if (file_count == file_max)	944	if (file_count == file_max)
938	{	945	{
939	file_max += FILE_INCREMENT;	946	file_max = xsum (file_max, FILE_INCREMENT);
940	file_list = (struct file_list_str ) xrealloc ((char ) file_list,	947	if (size_overflow_p (xtimes (file_max, sizeof (*fl))))
941	file_max * sizeof (*fl));	948	{
		949	error (0, 0, "save_file: too many files");
		950	return;
		951	}
		952	file_list = xrealloc (file_list, xtimes (file_max, sizeof (*fl)));
942	}	953	}
943	fl = &file_list[file_count++];	954	fl = &file_list[file_count++];
944	fl->l_file = cp = xmalloc (strlen (dir) + strlen (name) + 2);	955	fl->l_file = cp = xmalloc (strlen (dir) + strlen (name) + 2);
Lines 977-985 save_module (module) Link Here
977	{	988	{
978	if (mod_count == mod_max)	989	if (mod_count == mod_max)
979	{	990	{
980	mod_max += MODULE_INCREMENT;	991	mod_max = xsum (mod_max, MODULE_INCREMENT);
981	mod_list = (char *) xrealloc ((char ) mod_list,	992	if (size_overflow_p (xtimes (mod_max, sizeof (char *))))
982	mod_max * sizeof (char *));	993	{
		994	error (0, 0, "save_module: too many modules");
		995	return;
		996	}
		997	mod_list = xrealloc (mod_list, xtimes (mod_max, sizeof (char *)));
983	}	998	}
984	mod_list[mod_count++] = xstrdup (module);	999	mod_list[mod_count++] = xstrdup (module);
985	}	1000	}

Lines 917-923 serve_max_dotdot (arg) Link Here

(-)src/server.c (-3 / +22 lines)
917	int i;	917	int i;
918	char *p;	918	char *p;
919		919
920	if (lim < 0)	920	if (lim < 0 \|\| lim > 10000)
921	return;	921	return;
922	p = xmalloc (strlen (server_temp_dir) + 2 * lim + 10);	922	p = xmalloc (strlen (server_temp_dir) + 2 * lim + 10);
923	if (p == NULL)	923	if (p == NULL)
Lines 2018-2023 serve_notify (arg) Link Here
2018	{	2018	{
2019	char *cp;	2019	char *cp;
2020		2020
		2021	if (!data[0])
		2022	goto error;
		2023
2021	if (strchr (data, '+'))	2024	if (strchr (data, '+'))
2022	goto error;	2025	goto error;
2023		2026
Lines 2149-2154 serve_argument (arg) Link Here
2149	char *p;	2152	char *p;
2150		2153
2151	if (error_pending()) return;	2154	if (error_pending()) return;
		2155
		2156	if (argument_count >= 10000)
		2157	{
		2158	if (alloc_pending (80))
		2159	sprintf (pending_error_text,
		2160	"E Protocol error: too many arguments");
		2161	return;
		2162	}
2152		2163
2153	if (argument_vector_size <= argument_count)	2164	if (argument_vector_size <= argument_count)
2154	{	2165	{
Lines 2179-2184 serve_argumentx (arg) Link Here
2179	char *p;	2190	char *p;
2180		2191
2181	if (error_pending()) return;	2192	if (error_pending()) return;
		2193
		2194	if (argument_count <= 1)
		2195	{
		2196	if (alloc_pending (80))
		2197	sprintf (pending_error_text,
		2198	"E Protocol error: called argumentx without prior call to argument");
		2199	return;
		2200	}
2182		2201
2183	p = argument_vector[argument_count - 1];	2202	p = argument_vector[argument_count - 1];
2184	p = xrealloc (p, strlen (p) + 1 + strlen (arg) + 1);	2203	p = xrealloc (p, strlen (p) + 1 + strlen (arg) + 1);
Lines 2512-2518 check_command_legal_p (cmd_name) Link Here
2512	save some code here... -kff */	2531	save some code here... -kff */
2513		2532
2514	/* Chop newline by hand, for strcmp()'s sake. */	2533	/* Chop newline by hand, for strcmp()'s sake. */
2515	if (linebuf[num_red - 1] == '\n')	2534	if (num_red > 0 && linebuf[num_red - 1] == '\n')
2516	linebuf[num_red - 1] = '\0';	2535	linebuf[num_red - 1] = '\0';
2517		2536
2518	if (strcmp (linebuf, CVS_Username) == 0)	2537	if (strcmp (linebuf, CVS_Username) == 0)
Lines 2567-2573 check_command_legal_p (cmd_name) Link Here
2567	while ((num_red = getline (&linebuf, &linebuf_len, fp)) >= 0)	2586	while ((num_red = getline (&linebuf, &linebuf_len, fp)) >= 0)
2568	{	2587	{
2569	/* Chop newline by hand, for strcmp()'s sake. */	2588	/* Chop newline by hand, for strcmp()'s sake. */
2570	if (linebuf[num_red - 1] == '\n')	2589	if (num_red > 0 && linebuf[num_red - 1] == '\n')
2571	linebuf[num_red - 1] = '\0';	2590	linebuf[num_red - 1] = '\0';
2572		2591
2573	if (strcmp (linebuf, CVS_Username) == 0)	2592	if (strcmp (linebuf, CVS_Username) == 0)




#endif /* SERVER_SUPPORT || CLIENT_SUPPORT */

/*
 * Remove fmt str specifier other than %% or %s. And allow
 * only max_s %s specifiers
 */
wrap_clean_fmt_str(char *fmt, int max_s)
{
    while (*fmt) {
	if (fmt[0] == '%' && fmt[1])
	{
	    if (fmt[1] == '%') 
		fmt++;
	    else
		if (fmt[1] == 's' && max_s > 0)
		{
		    max_s--;
		    fmt++;
		} else 
		    *fmt = ' ';
	}
	fmt++;
    }
    return;
}

/*
 * Open a file and read lines, feeding each line to a line parser. Arrange
 * for keeping a temporary list of wrappers at the end, if the "temp"
 * argument is set.

    args = xmalloc (strlen (e->tocvsFilter)
		    + strlen (fileName)
		    + strlen (buf));

    wrap_clean_fmt_str(e->tocvsFilter, 2);
       e->tocvsFilter ourselves and giving a real error.  */
    sprintf (args, e->tocvsFilter, fileName, buf);
    run_setup (args);
    run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL|RUN_REALLY );


    args = xmalloc (strlen (e->fromcvsFilter)
		    + strlen (fileName));

    wrap_clean_fmt_str(e->fromcvsFilter, 1);
       e->fromcvsFilter ourselves and giving a real error.  */
    sprintf (args, e->fromcvsFilter, fileName);
    run_setup (args);
    run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL );

Return to bug 54773

Lines 267-269 when using GSSAPI.]) Link Here

(-)acinclude.m4 (+82 lines)
267	AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi])	267	AC_SEARCH_LIBS([gss_import_name], [gssapi_krb5 gssapi])
268	fi	268	fi
269	])dnl	269	])dnl
		270
		271
		272
		273	# size_max.m4 serial 2
		274	dnl Copyright (C) 2003 Free Software Foundation, Inc.
		275	dnl This file is free software, distributed under the terms of the GNU
		276	dnl General Public License. As a special exception to the GNU General
		277	dnl Public License, this file may be distributed as part of a program
		278	dnl that contains a configuration script generated by Autoconf, under
		279	dnl the same distribution terms as the rest of that program.
		280
		281	dnl From Bruno Haible.
		282
		283	AC_DEFUN([gl_SIZE_MAX],
		284	[
		285	AC_CHECK_HEADERS(stdint.h)
		286	dnl First test whether the system already has SIZE_MAX.
		287	AC_MSG_CHECKING([for SIZE_MAX])
		288	result=
		289	AC_EGREP_CPP([Found it], [
		290	#include <limits.h>
		291	#if HAVE_STDINT_H
		292	#include <stdint.h>
		293	#endif
		294	#ifdef SIZE_MAX
		295	Found it
		296	#endif
		297	], result=yes)
		298	if test -z "$result"; then
		299	dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
		300	dnl than the type 'unsigned long'.
		301	dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
		302	dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
		303	_AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
		304	[#include <stddef.h>], result=?)
		305	_AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
		306	[#include <stddef.h>], result=?)
		307	_AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
		308	[#include <stddef.h>], result=?)
		309	if test "$fits_in_uint" = 1; then
		310	dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
		311	dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
		312	AC_TRY_COMPILE([#include <stddef.h>
		313	extern size_t foo;
		314	extern unsigned long foo;
		315	], [], fits_in_uint=0)
		316	fi
		317	if test -z "$result"; then
		318	if test "$fits_in_uint" = 1; then
		319	result="$res_hi$res_lo"U
		320	else
		321	result="$res_hi$res_lo"UL
		322	fi
		323	else
		324	dnl Shouldn't happen, but who knows...
		325	result='~(size_t)0'
		326	fi
		327	fi
		328	AC_MSG_RESULT([$result])
		329	if test "$result" != yes; then
		330	AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
		331	[Define as the maximum value of type 'size_t', if the system doesn't define it.])
		332	fi
		333	])
334
335
336
337	# xsize.m4 serial 3
338	dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
339	dnl This file is free software, distributed under the terms of the GNU
340	dnl General Public License. As a special exception to the GNU General
341	dnl Public License, this file may be distributed as part of a program
342	dnl that contains a configuration script generated by Autoconf, under
343	dnl the same distribution terms as the rest of that program.
344
345	AC_DEFUN([gl_XSIZE],
346	[
347	dnl Prerequisites of lib/xsize.h.
348	AC_REQUIRE([gl_SIZE_MAX])
349	AC_REQUIRE([AC_C_INLINE])
350	AC_CHECK_HEADERS(stdint.h)
351	])

Lines 281-286 when using GSSAPI.]) Link Here

(-)aclocal.m4 (+82 lines)
281	fi	281	fi
282	])dnl	282	])dnl
283		283
		284
		285
		286	# size_max.m4 serial 2
		287	dnl Copyright (C) 2003 Free Software Foundation, Inc.
		288	dnl This file is free software, distributed under the terms of the GNU
		289	dnl General Public License. As a special exception to the GNU General
		290	dnl Public License, this file may be distributed as part of a program
		291	dnl that contains a configuration script generated by Autoconf, under
		292	dnl the same distribution terms as the rest of that program.
		293
		294	dnl From Bruno Haible.
		295
		296	AC_DEFUN([gl_SIZE_MAX],
		297	[
		298	AC_CHECK_HEADERS(stdint.h)
		299	dnl First test whether the system already has SIZE_MAX.
		300	AC_MSG_CHECKING([for SIZE_MAX])
		301	result=
		302	AC_EGREP_CPP([Found it], [
		303	#include <limits.h>
		304	#if HAVE_STDINT_H
		305	#include <stdint.h>
		306	#endif
		307	#ifdef SIZE_MAX
		308	Found it
		309	#endif
		310	], result=yes)
		311	if test -z "$result"; then
		312	dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
		313	dnl than the type 'unsigned long'.
		314	dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
		315	dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
		316	_AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
		317	[#include <stddef.h>], result=?)
		318	_AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
		319	[#include <stddef.h>], result=?)
		320	_AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
		321	[#include <stddef.h>], result=?)
		322	if test "$fits_in_uint" = 1; then
		323	dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
		324	dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
		325	AC_TRY_COMPILE([#include <stddef.h>
		326	extern size_t foo;
		327	extern unsigned long foo;
		328	], [], fits_in_uint=0)
		329	fi
		330	if test -z "$result"; then
		331	if test "$fits_in_uint" = 1; then
		332	result="$res_hi$res_lo"U
		333	else
		334	result="$res_hi$res_lo"UL
		335	fi
		336	else
		337	dnl Shouldn't happen, but who knows...
		338	result='~(size_t)0'
		339	fi
		340	fi
		341	AC_MSG_RESULT([$result])
		342	if test "$result" != yes; then
		343	AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
		344	[Define as the maximum value of type 'size_t', if the system doesn't define it.])
		345	fi
		346	])
		347
348
349
350	# xsize.m4 serial 3
351	dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
352	dnl This file is free software, distributed under the terms of the GNU
353	dnl General Public License. As a special exception to the GNU General
354	dnl Public License, this file may be distributed as part of a program
355	dnl that contains a configuration script generated by Autoconf, under
356	dnl the same distribution terms as the rest of that program.
357
358	AC_DEFUN([gl_XSIZE],
359	[
360	dnl Prerequisites of lib/xsize.h.
361	AC_REQUIRE([gl_SIZE_MAX])
362	AC_REQUIRE([AC_C_INLINE])
363	AC_CHECK_HEADERS(stdint.h)
364	])
365
284	# Do all the work for Automake. -- Autoconf --	366	# Do all the work for Automake. -- Autoconf --
285		367
286	# This macro actually does too much some checks are only needed if	368	# This macro actually does too much some checks are only needed if

Lines 237-242 wrap_unparse_rcs_options (line, first_ca Link Here

(-)src/wrapper.c (-6 / +28 lines)
237	#endif /* SERVER_SUPPORT \|\| CLIENT_SUPPORT */	237	#endif /* SERVER_SUPPORT \|\| CLIENT_SUPPORT */
238		238
239	/*	239	/*
		240	* Remove fmt str specifier other than %% or %s. And allow
		241	* only max_s %s specifiers
		242	*/
		243	wrap_clean_fmt_str(char *fmt, int max_s)
		244	{
		245	while (*fmt) {
		246	if (fmt[0] == '%' && fmt[1])
		247	{
		248	if (fmt[1] == '%')
		249	fmt++;
		250	else
		251	if (fmt[1] == 's' && max_s > 0)
		252	{
		253	max_s--;
		254	fmt++;
		255	} else
		256	*fmt = ' ';
		257	}
		258	fmt++;
		259	}
		260	return;
		261	}
		262
		263	/*
240	* Open a file and read lines, feeding each line to a line parser. Arrange	264	* Open a file and read lines, feeding each line to a line parser. Arrange
241	* for keeping a temporary list of wrappers at the end, if the "temp"	265	* for keeping a temporary list of wrappers at the end, if the "temp"
242	* argument is set.	266	* argument is set.
Lines 556-564 wrap_tocvs_process_file(fileName) Link Here
556	args = xmalloc (strlen (e->tocvsFilter)	580	args = xmalloc (strlen (e->tocvsFilter)
557	+ strlen (fileName)	581	+ strlen (fileName)
558	+ strlen (buf));	582	+ strlen (buf));
559	/* FIXME: sprintf will blow up if the format string contains items other	583
560	than %s, or contains too many %s's. We should instead be parsing	584	wrap_clean_fmt_str(e->tocvsFilter, 2);
561	e->tocvsFilter ourselves and giving a real error. */
562	sprintf (args, e->tocvsFilter, fileName, buf);	585	sprintf (args, e->tocvsFilter, fileName, buf);
563	run_setup (args);	586	run_setup (args);
564	run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL\|RUN_REALLY );	587	run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL\|RUN_REALLY );
Lines 590-598 wrap_fromcvs_process_file(fileName) Link Here
590		613
591	args = xmalloc (strlen (e->fromcvsFilter)	614	args = xmalloc (strlen (e->fromcvsFilter)
592	+ strlen (fileName));	615	+ strlen (fileName));
593	/* FIXME: sprintf will blow up if the format string contains items other	616
594	than %s, or contains too many %s's. We should instead be parsing	617	wrap_clean_fmt_str(e->fromcvsFilter, 1);
595	e->fromcvsFilter ourselves and giving a real error. */
596	sprintf (args, e->fromcvsFilter, fileName);	618	sprintf (args, e->fromcvsFilter, fileName);
597	run_setup (args);	619	run_setup (args);
598	run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL );	620	run_exec(RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL );

Added Link Here

(-)lib/xsize.h (+108 lines)
1	/* xsize.h -- Checked size_t computations.
2
3	Copyright (C) 2003 Free Software Foundation, Inc.
4
5	This program is free software; you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by
7	the Free Software Foundation; either version 2, or (at your option)
8	any later version.
9
10	This program is distributed in the hope that it will be useful,
11	but WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	GNU General Public License for more details.
14
15	You should have received a copy of the GNU General Public License
16	along with this program; if not, write to the Free Software Foundation,
17	Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
18
19	#ifndef _XSIZE_H
20	#define _XSIZE_H
21
22	/* Get size_t. */
23	#include <stddef.h>
24
25	/* Get SIZE_MAX. */
26	#include <limits.h>
27	#if HAVE_STDINT_H
28	# include <stdint.h>
29	#endif
30
31	/* The size of memory objects is often computed through expressions of
32	type size_t. Example:
33	void* p = malloc (header_size + n * element_size).
34	These computations can lead to overflow. When this happens, malloc()
35	returns a piece of memory that is way too small, and the program then
36	crashes while attempting to fill the memory.
37	To avoid this, the functions and macros in this file check for overflow.
38	The convention is that SIZE_MAX represents overflow.
39	malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
40	implementation that uses mmap --, it's recommended to use size_overflow_p()
41	or size_in_bounds_p() before invoking malloc().
42	The example thus becomes:
43	size_t size = xsum (header_size, xtimes (n, element_size));
44	void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
45	*/
46
47	/* Convert an arbitrary value >= 0 to type size_t. */
48	#define xcast_size_t(N) \
49	((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
50
51	/* Sum of two sizes, with overflow check. */
52	static inline size_t
53	#if __GNUC__ >= 3
54	__attribute__ ((__pure__))
55	#endif
56	xsum (size_t size1, size_t size2)
57	{
58	size_t sum = size1 + size2;
59	return (sum >= size1 ? sum : SIZE_MAX);
60	}
61
62	/* Sum of three sizes, with overflow check. */
63	static inline size_t
64	#if __GNUC__ >= 3
65	__attribute__ ((__pure__))
66	#endif
67	xsum3 (size_t size1, size_t size2, size_t size3)
68	{
69	return xsum (xsum (size1, size2), size3);
70	}
71
72	/* Sum of four sizes, with overflow check. */
73	static inline size_t
74	#if __GNUC__ >= 3
75	__attribute__ ((__pure__))
76	#endif
77	xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
78	{
79	return xsum (xsum (xsum (size1, size2), size3), size4);
80	}
81
82	/* Maximum of two sizes, with overflow check. */
83	static inline size_t
84	#if __GNUC__ >= 3
85	__attribute__ ((__pure__))
86	#endif
87	xmax (size_t size1, size_t size2)
88	{
89	/* No explicit check is needed here, because for any n:
90	max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */
91	return (size1 >= size2 ? size1 : size2);
92	}
93
94	/* Multiplication of a count with an element size, with overflow check.
95	The count must be >= 0 and the element size must be > 0.
96	This is a macro, not an inline function, so that it works correctly even
97	when N is of a wider tupe and N > SIZE_MAX. */
98	#define xtimes(N, ELSIZE) \
99	((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
100
101	/* Check for overflow. */
102	#define size_overflow_p(SIZE) \
103	((SIZE) == SIZE_MAX)
104	/* Check against overflow. */
105	#define size_in_bounds_p(SIZE) \
106	((SIZE) != SIZE_MAX)
107
108	#endif /* _XSIZE_H */

Lines 1-3 Link Here

(-)src/ChangeLog (+9 lines)
		1	2004-05-28 Derek Price <derek@ximbiot.com>
		2
		3	* commit.c, filesubr.c, history.c, server.c, wrapper.c: Various
		4	security fixes.
		5	(Original patch from Stefan Essler <s.esser@e-matters.de> & Sebastian
		6	Krahmer <krahmer@suse.de>.)
		7
		8	* cvs.h: Include xsize.h.
		9
1	2004-05-19 Derek Price <derek@ximbiot.com>	10	2004-05-19 Derek Price <derek@ximbiot.com>
2		11
3	* server.c (serve_unchanged, serve_is_modified): Overwrite existing	12	* server.c (serve_unchanged, serve_is_modified): Overwrite existing