diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
| commit | 6a3294658a85b4d0d1894d4f08af68a4cdf31bb0 (patch) | |
| tree | 4b921333653c51253153a70fd9af2d29c04a21e3 /net/spdy/spdy_framer.cc | |
| parent | a263d56dd156e94f3453604d231e06a9bb1f537d (diff) | |
| download | chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.zip chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.gz chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.bz2 | |
Fix NULL vs 0 problems which break the build with -Werror using GCC 4.5
BUG=none
TEST=try to compile with gcc 4.5
Patch by Benjamin Jemlich <pcgod99@gmail.com>.
Review URL: http://codereview.chromium.org/2007003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_framer.cc')
| -rw-r--r-- | net/spdy/spdy_framer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index dc1f856..8ab5bb7d 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.cc @@ -368,7 +368,7 @@ size_t SpdyFramer::ProcessDataFramePayload(const char* data, size_t len) { if (current_data_frame.flags() & DATA_FLAG_COMPRESSED) { // TODO(mbelshe): Assert that the decompressor is init'ed. if (!InitializeDecompressor()) - return NULL; + return 0; size_t decompressed_max_size = amount_to_forward * 100; scoped_array<char> decompressed(new char[decompressed_max_size]); |