kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 11:22:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not modify the compr buffer pointer.

Browse Source 
The compr pointer points to the allocated memory. We must not modify
it value.
If we advance the pointer by two bytes each time we compress an answer
we will end to write in some random memory and segfault.

Now, we use a std::vector to correctly handle allocation
(and deallocation!) of the memory.
This commit is contained in:
Matthieu Gautier 2017-03-15 09:49:21 +01:00
parent a27010c247
commit 3592cd84c6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/kiwix-serve.cpp
View File

@ -49,6 +49,7 @@ extern "C" {
#include <getopt.h> #include <getopt.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <vector>
#include <map> #include <map>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
@ -142,14 +143,13 @@ bool isVerbose() {
/* For compression */ /* For compression */
#define COMPRESSOR_BUFFER_SIZE 10000000 #define COMPRESSOR_BUFFER_SIZE 10000000
static Bytef *compr = (Bytef *)malloc(COMPRESSOR_BUFFER_SIZE);
static uLongf comprLen;
static static
bool compress_content(string &content, bool compress_content(string &content,
const string &mimeType) const string &mimeType)
{ {
static std::vector<Bytef> compr_buffer;
/* Compute the lengh */ /* Compute the lengh */
unsigned int contentLength = content.size(); unsigned int contentLength = content.size();
@ -164,8 +164,9 @@ bool compress_content(string &content,
/* Compress the content if necessary */ /* Compress the content if necessary */
if (deflated) { if (deflated) {
pthread_mutex_lock(&compressorLock); pthread_mutex_lock(&compressorLock);
comprLen = COMPRESSOR_BUFFER_SIZE; compr_buffer.reserve(COMPRESSOR_BUFFER_SIZE);
compress(compr, &comprLen, (const Bytef*)(content.data()), contentLength); uLongf comprLen = COMPRESSOR_BUFFER_SIZE;
compress(&compr_buffer[0], &comprLen, (const Bytef*)(content.data()), contentLength);
if (comprLen > 2 && comprLen < (contentLength+2)) { if (comprLen > 2 && comprLen < (contentLength+2)) {
@ -174,11 +175,8 @@ bool compress_content(string &content,
We need to chunk them off (move the content 2bytes) We need to chunk them off (move the content 2bytes)
It has no incidence on other browsers It has no incidence on other browsers
See http://www.subbu.org/blog/2008/03/ie7-deflate-or-not and comments */ See http://www.subbu.org/blog/2008/03/ie7-deflate-or-not and comments */
compr += 2;
comprLen -= 2;
content = string((char *)compr, comprLen); content = string((char *)&compr_buffer[2], comprLen-2);
contentLength = comprLen;
} else { } else {
deflated = false; deflated = false;
} }