[NaCl SDK] nacl_io: Fix bug in getaddrinfo() where service is "0"

native_client_sdk/src/libraries/nacl_io/host_resolver.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#define __STDC_LIMIT_MACROS
+
 #include "nacl_io/host_resolver.h"
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "nacl_io/kernel_proxy.h"
 #include "nacl_io/ossocket.h"
 #include "nacl_io/pepper_interface.h"
 
 #ifdef PROVIDES_SOCKET_API
 
 namespace {
@@ skipping 206 matching lines @@
 
   if (node == NULL && service == NULL)
     return EAI_NONAME;
 
   // Check the service name (port).  Currently we only handle numeric
   // services.
   long port = 0;
   if (service != NULL) {
     char* cp;
     port = strtol(service, &cp, 10);
-    if (port > 0 && port <= 65535 && *cp == '\0') {
+    if (port >= 0 && port <= UINT16_MAX && *cp == '\0') {
       port = htons(port);
     } else {
       return EAI_SERVICE;
     }
   }
 
   struct addrinfo default_hints;
   memset(&default_hints, 0, sizeof(default_hints));
   const struct addrinfo* hints = hints_in ? hints_in : &default_hints;
 
@@ skipping 97 matching lines @@
       // string so this condition is never true.
       // TODO(sbc): investigate this issue with PPAPI team.
       if (len > 0) {
         // Copy and NULL-terminate the UTF8 string var.
         canon_name = static_cast<char*>(malloc(len + 1));
         strncpy(canon_name, tmp, len);
         canon_name[len] = '\0';
       }
     }
     if (!canon_name)
       canon_name = strdup(node);

[bradn, 2014/06/19 19:38:38]

While you're in here. When I was trying to figure out what was going on, I
noticed that canon_name is thee only thing used past this point (ie node is
not).
Did you mean for this to be outside the
if (hints->ai_flags & AI_CANONNAME) {
?
Otherwise I'm not clear on how the CreateAddrInfo below works when AI_CANONNAME
is off.

[Sam Clegg, 2014/06/19 19:59:56]

If AI_CANONNAME is off then I think canon_name is supposed to be NULL in the
results.

     var_interface->Release(name_var);
   }
 
   int num_addresses = resolver_iface->GetNetAddressCount(resolver);
   if (0 == num_addresses)
     return EAI_NODATA;
 
   // Convert address to sockaddr struct.
   for (int i = 0; i < num_addresses; i++) {
     ScopedResource addr(ppapi_, resolver_iface->GetNetAddress(resolver, i));
@@ skipping 61 matching lines @@
   hostent_.h_addr_list = NULL;
 #if !defined(h_addr)
   // Initialize h_addr separately in the case where it is not a macro.
   hostent_.h_addr = NULL;
 #endif
 }
 
 }  // namespace nacl_io
 
 #endif  // PROVIDES_SOCKET_API