Attachment #72242 for bug #111634

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




# endif
#endif
int
memcheck (unsigned long addr, unsigned long len)
{
#ifdef GRUB_UTIL
# ifdef __PIC__

    return ! errnum;
#  endif
# else /* __PIC__ */
  auto unsigned long start_addr (void);
  auto unsigned long end_addr (void);
  
  auto unsigned long start_addr (void)
    {
      int ret;
#  if defined(HAVE_START_SYMBOL)

      return ret;
    }

  auto unsigned long end_addr (void)
    {
      int ret;
#  if defined(HAVE_END_SYMBOL)

void *
grub_memmove (void *to, const void *from, int len)
{
   if (memcheck ((unsigned long) to, len))
     {
       /* This assembly code is stolen from
	  linux-2.2.2/include/asm-i386/string.h. This is not very fast

{
  char *p = start;

  if (memcheck ((unsigned long) start, len))
    {
      while (len -- > 0)
	*p ++ = c;

Lines 912-918 Link Here

(-)grub-0.97/work/grub-0.97/stage2/shared.h (-1 / +1 lines)
912	int nul_terminate (char *str);	912	int nul_terminate (char *str);
913	int get_based_digit (int c, int base);	913	int get_based_digit (int c, int base);
914	int safe_parse_maxint (char *str_ptr, int myint_ptr);	914	int safe_parse_maxint (char *str_ptr, int myint_ptr);
915	int memcheck (int start, int len);	915	int memcheck (unsigned long start, unsigned long len);
916	void grub_putstr (const char *str);	916	void grub_putstr (const char *str);
917		917
918	#ifndef NO_DECOMPRESSION	918	#ifndef NO_DECOMPRESSION

Return to bug 111634

Lines 1214-1220 Link Here

(-)grub-0.97/work/grub-0.97/stage2/char_io.c (-7 / +7 lines)
1214	# endif	1214	# endif
1215	#endif	1215	#endif
1216	int	1216	int
1217	memcheck (int addr, int len)	1217	memcheck (unsigned long addr, unsigned long len)
1218	{	1218	{
1219	#ifdef GRUB_UTIL	1219	#ifdef GRUB_UTIL
1220	# ifdef __PIC__	1220	# ifdef __PIC__
Lines 1226-1235 Link Here
1226	return ! errnum;	1226	return ! errnum;
1227	# endif	1227	# endif
1228	# else /* __PIC__ */	1228	# else /* __PIC__ */
1229	auto int start_addr (void);	1229	auto unsigned long start_addr (void);
1230	auto int end_addr (void);	1230	auto unsigned long end_addr (void);
1231		1231
1232	auto int start_addr (void)	1232	auto unsigned long start_addr (void)
1233	{	1233	{
1234	int ret;	1234	int ret;
1235	# if defined(HAVE_START_SYMBOL)	1235	# if defined(HAVE_START_SYMBOL)
Lines 1242-1248 Link Here
1242	return ret;	1242	return ret;
1243	}	1243	}
1244		1244
1245	auto int end_addr (void)	1245	auto unsigned long end_addr (void)
1246	{	1246	{
1247	int ret;	1247	int ret;
1248	# if defined(HAVE_END_SYMBOL)	1248	# if defined(HAVE_END_SYMBOL)
Lines 1283-1289 Link Here
1283	void *	1283	void *
1284	grub_memmove (void to, const void from, int len)	1284	grub_memmove (void to, const void from, int len)
1285	{	1285	{
1286	if (memcheck ((int) to, len))	1286	if (memcheck ((unsigned long) to, len))
1287	{	1287	{
1288	/* This assembly code is stolen from	1288	/* This assembly code is stolen from
1289	linux-2.2.2/include/asm-i386/string.h. This is not very fast	1289	linux-2.2.2/include/asm-i386/string.h. This is not very fast
Lines 1321-1327 Link Here
1321	{	1321	{
1322	char *p = start;	1322	char *p = start;
1323		1323
1324	if (memcheck ((int) start, len))	1324	if (memcheck ((unsigned long) start, len))
1325	{	1325	{
1326	while (len -- > 0)	1326	while (len -- > 0)
1327	*p ++ = c;	1327	*p ++ = c;