toolkit/components/protobuf/r512.patch

Tue, 06 Jan 2015 21:39:09 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 06 Jan 2015 21:39:09 +0100
branch
TOR_BUG_9701
changeset 8
97036ab72558
permissions
-rw-r--r--

Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.

     1 Index: src/google/protobuf/io/zero_copy_stream_impl_lite.cc
     2 ===================================================================
     3 --- src/google/protobuf/io/zero_copy_stream_impl_lite.cc	(revision 511)
     4 +++ src/google/protobuf/io/zero_copy_stream_impl_lite.cc	(revision 512)
     5 @@ -36,6 +36,8 @@
     6  #include <google/protobuf/stubs/common.h>
     7  #include <google/protobuf/stubs/stl_util.h>
     9 +#include <algorithm>
    10 +
    11  namespace google {
    12  namespace protobuf {
    13  namespace io {

mercurial