Commit bef1b140 authored by Yang Tse's avatar Yang Tse
Browse files

Fix compiler warning: out of bound access

parent c9188e22

ares/acountry.c

+8 −3
Original line number Diff line number Diff line
@@ -612,9 +612,14 @@ static void find_country_from_cname(const char *cname, struct in_addr addr) 
    printf("Name for country-number %d not found.\n", cnumber);

  else

    {

      if (ver_1 && *(unsigned short*)&country->short_name != *(unsigned*)&ccode_A2)

        printf("short-name mismatch; %s vs %s\n", country->short_name, ccode_A2);



      if (ver_1)

        {

          if ((country->short_name[0] != ccode_A2[0]) ||

              (country->short_name[1] != ccode_A2[1]) ||

              (country->short_name[2] != ccode_A2[2]))

            printf("short-name mismatch; %s vs %s\n",

                   country->short_name, ccode_A2);

        }

      printf("%s (%s), number %d.\n",

             country->long_name, country->short_name, cnumber);

    }

ares/adig.c

+9 −6
Original line number Diff line number Diff line
@@ -219,9 +219,10 @@ int main(int argc, char **argv) 
              if (strcmp(flags[i].name, optarg) == 0)

                break;

            }

          if (i == nflags)

            usage();

          if (i < nflags)

            options.flags |= flags[i].value;

          else

            usage();

          break;



        case 's':
@@ -256,9 +257,10 @@ int main(int argc, char **argv) 
              if (strcasecmp(classes[i].name, optarg) == 0)

                break;

            }

          if (i == nclasses)

            usage();

          if (i < nclasses)

            dnsclass = classes[i].value;

          else

            usage();

          break;



        case 't':
@@ -268,9 +270,10 @@ int main(int argc, char **argv) 
              if (strcasecmp(types[i].name, optarg) == 0)

                break;

            }

          if (i == ntypes)

            usage();

          if (i < ntypes)

            type = types[i].value;

          else

            usage();

          break;



        case 'T':