Commit 5c820def authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'sysrqb/bug14802_025'

parents f4c07359 9ae321db

changes/bug14802

0 → 100644
+4 −0
Original line number Original line Diff line number Diff line 
  o Minor bugfix:

    - Make an educated guess about how much memory the system has when our

      detection functionality fails on some operating system.  Fixes bug 14802;

      bugfix on 0.2.5.4-alpha.

src/common/compat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3161,7 +3161,7 @@ get_total_system_memory_impl(void) 
  size_t len = sizeof(memsize);

  size_t len = sizeof(memsize);

  int mib[2] = {CTL_HW, HW_USERMEM};

  int mib[2] = {CTL_HW, HW_USERMEM};

  if (sysctl(mib,2,&memsize,&len,NULL,0))

  if (sysctl(mib,2,&memsize,&len,NULL,0))

    return -1;

    return 0;





  return memsize;

  return memsize;