Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 12:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Merge remote-tracking branch 'origin/topic/dev/bugrpone-narrowing-conversions-base64'"

Browse source 
This reverts commit 705210a035.
The original changes broke the Base64.h API which may be used by
external plugins.

Fixes GH-676
This commit is contained in:
Jon Siwek 2019-11-04 09:43:54 -08:00
parent 33c26e9ea3
commit b6def63167
5 changed files with 35 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Base64.h
View file

@ -3,7 +3,6 @@
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <utility>
#include "util.h"
#include "BroString.h"
@ -28,12 +27,13 @@ public:
// an appropriate size will be new'd and *buf will point
// to the buffer on return. *blen holds the length of
// decoded data on return. The function returns the number of
// input bytes processed and a success flag.
// input bytes processed, since the decoding will stop when there
// is not enough output buffer space.
std::pair<size_t, bool> Decode(size_t len, const char* data, size_t* pblen, char** buf);
void Encode(size_t len, const unsigned char* data, size_t* blen, char** buf);
int Decode(int len, const char* data, int* blen, char** buf);
void Encode(int len, const unsigned char* data, int* blen, char** buf);
int Done(size_t* pblen, char** pbuf);
int Done(int* pblen, char** pbuf);
int HasData() const { return base64_group_next != 0; }
// True if an error has occurred.