Skip to content

made de85 table initialization explicit and safer #2219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Latika2005 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

made de85 table initialization explicit and safer #2219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions base85.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "git-compat-util.h"
#include "base85.h"
#include <string.h>

#undef DEBUG_85

Expand All @@ -26,15 +27,18 @@ static const char en85[] = {
'|', '}', '~'
};

static char de85[256];
static unsigned char de85[256];
static bool de85_ready;
static void prep_base85(void)
{
if (de85['Z'])
if (de85_ready)
return;
memset(de85, 0, sizeof(de85));
for (size_t i = 0; i < ARRAY_SIZE(en85); i++) {
int ch = en85[i];
de85[ch] = i + 1;
unsigned char ch = (unsigned char)en85[i];
de85[ch] = (unsigned char)(i + 1);
}
de85_ready = true;
}

int decode_85(char *dst, const char *buffer, int len)
Expand All @@ -48,13 +52,13 @@ int decode_85(char *dst, const char *buffer, int len)
unsigned char ch;
do {
ch = *buffer++;
de = de85[ch];
de = de85[(unsigned char)ch];
if (--de < 0)
return error("invalid base85 alphabet %c", ch);
acc = acc * 85 + de;
} while (--cnt);
ch = *buffer++;
de = de85[ch];
de = de85[(unsigned char)ch];
if (--de < 0)
return error("invalid base85 alphabet %c", ch);
/* Detect overflow. */
Expand Down
Loading