[NaCl SDK] Make the SDK examples buildable as a packaged app.

native_client_sdk/src/libraries/nacl_io/mount_node.cc

 /* Copyright (c) 2012 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.
  */
 #include "nacl_io/mount_node.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/stat.h>
@@ skipping 67 matching lines @@
   return -1;
 }
 
 void* MountNode::MMap(void* addr, size_t length, int prot, int flags,
                       size_t offset) {
   // This default mmap support is just enough to make dlopen work.
   // This implementation just reads from the mount into the mmap'd memory area.
   void* new_addr = addr;
   int err = _real_mmap(&new_addr, length, prot | PROT_WRITE, flags |
                        MAP_ANONYMOUS, -1, 0);
-  if (addr == MAP_FAILED) {
-    _real_munmap(addr, length);
+  if (new_addr == MAP_FAILED) {
+    _real_munmap(new_addr, length);
     errno = err;
     return MAP_FAILED;
   }
 
-  ssize_t cnt = Read(offset, addr, length);
+  ssize_t cnt = Read(offset, new_addr, length);
   if (cnt == -1) {
-    _real_munmap(addr, length);
+    _real_munmap(new_addr, length);
     errno = ENOSYS;
     return MAP_FAILED;
   }
 
   return new_addr;
 }
 
 int MountNode::Munmap(void* addr, size_t length) {
   return _real_munmap(addr, length);
 }
@@ skipping 49 matching lines @@
 
 void MountNode::Link() {
   Acquire();
   stat_.st_nlink++;
 }
 
 void MountNode::Unlink() {
   stat_.st_nlink--;
   Release();
 }