ado/ssp
1
1
Fork 0
mirror of https://github.com/red0124/ssp.git synced 2025-01-23 04:55:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with get_line_buffer when used with data buffer that is not null terminated and does not end with \n (#40)

Browse Source
This commit is contained in:
red0124 2024-03-01 02:47:04 +01:00 committed by GitHub
parent c5b50f2b47
commit 27bd60b5ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 178 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
include/ss/common.hpp
View File

@ -38,45 +38,40 @@ inline void* strict_realloc(void* ptr, size_t size) {
} }
#if __unix__ #if __unix__
inline ssize_t get_line_file(char** lineptr, size_t* n, FILE* stream) { inline ssize_t get_line_file(char*& lineptr, size_t& n, FILE* file) {
return getline(lineptr, n, stream); return getline(&lineptr, &n, file);
} }
#else #else
using ssize_t = intptr_t; using ssize_t = intptr_t;
ssize_t get_line_file(char** lineptr, size_t* n, FILE* fp) { ssize_t get_line_file(char*& lineptr, size_t& n, FILE* file) {
if (lineptr == nullptr || n == nullptr || fp == nullptr) {
errno = EINVAL;
return -1;
}
char buff[get_line_initial_buffer_size]; char buff[get_line_initial_buffer_size];
if (*lineptr == nullptr || *n < sizeof(buff)) { if (lineptr == nullptr || n < sizeof(buff)) {
size_t new_n = sizeof(buff); size_t new_n = sizeof(buff);
*lineptr = static_cast<char*>(strict_realloc(*lineptr, new_n)); lineptr = static_cast<char*>(strict_realloc(lineptr, new_n));
*n = new_n; n = new_n;
} }
(*lineptr)[0] = '\0'; lineptr[0] = '\0';
size_t line_used = 0; size_t line_used = 0;
while (std::fgets(buff, sizeof(buff), fp) != nullptr) { while (std::fgets(buff, sizeof(buff), file) != nullptr) {
line_used = std::strlen(*lineptr); line_used = std::strlen(lineptr);
size_t buff_used = std::strlen(buff); size_t buff_used = std::strlen(buff);
if (*n <= buff_used + line_used) { if (n <= buff_used + line_used) {
size_t new_n = *n * 2; size_t new_n = n * 2;
*lineptr = static_cast<char*>(strict_realloc(*lineptr, new_n)); lineptr = static_cast<char*>(strict_realloc(lineptr, new_n));
*n = new_n; n = new_n;
} }
std::memcpy(*lineptr + line_used, buff, buff_used); std::memcpy(lineptr + line_used, buff, buff_used);
line_used += buff_used; line_used += buff_used;
(*lineptr)[line_used] = '\0'; lineptr[line_used] = '\0';
if ((*lineptr)[line_used - 1] == '\n') { if (lineptr[line_used - 1] == '\n') {
return line_used; return line_used;
} }
} }
@ -86,4 +81,68 @@ ssize_t get_line_file(char** lineptr, size_t* n, FILE* fp) {
#endif #endif
ssize_t get_line_buffer(char*& lineptr, size_t& n,
const char* const csv_data_buffer, size_t csv_data_size,
size_t& curr_char) {
if (curr_char >= csv_data_size) {
return -1;
}
if (lineptr == nullptr || n < get_line_initial_buffer_size) {
auto new_lineptr = static_cast<char*>(
strict_realloc(lineptr, get_line_initial_buffer_size));
lineptr = new_lineptr;
n = get_line_initial_buffer_size;
}
size_t line_used = 0;
while (curr_char < csv_data_size) {
if (line_used + 1 >= n) {
size_t new_n = n * 2;
char* new_lineptr =
static_cast<char*>(strict_realloc(lineptr, new_n));
n = new_n;
lineptr = new_lineptr;
}
auto c = csv_data_buffer[curr_char++];
lineptr[line_used++] = c;
if (c == '\n') {
lineptr[line_used] = '\0';
return line_used;
}
}
if (line_used != 0) {
lineptr[line_used] = '\0';
return line_used;
}
return -1;
}
std::tuple<ssize_t, bool> get_line(char*& buffer, size_t& buffer_size,
FILE* file,
const char* const csv_data_buffer,
size_t csv_data_size, size_t& curr_char) {
ssize_t ssize;
if (file) {
ssize = get_line_file(buffer, buffer_size, file);
curr_char = std::ftell(file);
} else {
ssize = get_line_buffer(buffer, buffer_size, csv_data_buffer,
csv_data_size, curr_char);
}
if (ssize == -1) {
if (errno == ENOMEM) {
throw std::bad_alloc{};
}
return {ssize, true};
}
return {ssize, false};
}
} /* ss */ } /* ss */

71
include/ss/parser.hpp
View File

@ -749,46 +749,9 @@ private:
reader(const reader& other) = delete; reader(const reader& other) = delete;
reader& operator=(const reader& other) = delete; reader& operator=(const reader& other) = delete;
ssize_t get_line_buffer(char** lineptr, size_t* n,
const char* const csv_data_buffer,
size_t csv_data_size, size_t& curr_char) {
if (curr_char >= csv_data_size) {
return -1;
}
if (*lineptr == nullptr || *n < get_line_initial_buffer_size) {
auto new_lineptr = static_cast<char*>(
strict_realloc(*lineptr, get_line_initial_buffer_size));
*lineptr = new_lineptr;
*n = get_line_initial_buffer_size;
}
size_t line_used = 0;
while (curr_char <= csv_data_size) {
if (line_used + 1 >= *n) {
size_t new_n = *n * 2;
char* new_lineptr =
static_cast<char*>(strict_realloc(*lineptr, new_n));
*n = new_n;
*lineptr = new_lineptr;
}
auto c = csv_data_buffer[curr_char++];
(*lineptr)[line_used++] = c;
if (c == '\n') {
(*lineptr)[line_used] = '\0';
return line_used;
}
}
return (line_used != 0) ? line_used : -1;
}
// read next line each time in order to set eof_ // read next line each time in order to set eof_
bool read_next() { bool read_next() {
next_line_converter_.clear_error(); next_line_converter_.clear_error();
ssize_t ssize = 0;
size_t size = 0; size_t size = 0;
while (size == 0) { while (size == 0) {
++line_number_; ++line_number_;
@ -797,21 +760,11 @@ private:
} }
chars_read_ = curr_char_; chars_read_ = curr_char_;
if (file_) { auto [ssize, eof] =
ssize = get_line_file(&next_line_buffer_, get_line(next_line_buffer_, next_line_buffer_size_, file_,
&next_line_buffer_size_, file_); csv_data_buffer_, csv_data_size_, curr_char_);
curr_char_ = std::ftell(file_);
} else {
ssize = get_line_buffer(&next_line_buffer_,
&next_line_buffer_size_,
csv_data_buffer_, csv_data_size_,
curr_char_);
}
if (ssize == -1) { if (eof) {
if (errno == ENOMEM) {
throw std::bad_alloc{};
}
return false; return false;
} }
@ -953,18 +906,12 @@ private:
bool append_next_line_to_buffer(char*& buffer, size_t& size) { bool append_next_line_to_buffer(char*& buffer, size_t& size) {
undo_remove_eol(buffer, size); undo_remove_eol(buffer, size);
ssize_t next_ssize; chars_read_ = curr_char_;
if (file_) { auto [next_ssize, eof] =
next_ssize = get_line(helper_buffer_, helper_buffer_size, file_,
get_line_file(&helper_buffer_, &helper_buffer_size, file_); csv_data_buffer_, csv_data_size_, curr_char_);
} else {
next_ssize =
get_line_buffer(&helper_buffer_, &helper_buffer_size,
csv_data_buffer_, csv_data_size_,
curr_char_);
}
if (next_ssize == -1) { if (eof) {
return false; return false;
} }

172
ssp.hpp
View File

@ -650,45 +650,40 @@ inline void* strict_realloc(void* ptr, size_t size) {
} }
#if __unix__ #if __unix__
inline ssize_t get_line_file(char** lineptr, size_t* n, FILE* stream) { inline ssize_t get_line_file(char*& lineptr, size_t& n, FILE* file) {
return getline(lineptr, n, stream); return getline(&lineptr, &n, file);
} }
#else #else
using ssize_t = intptr_t; using ssize_t = intptr_t;
ssize_t get_line_file(char** lineptr, size_t* n, FILE* fp) { ssize_t get_line_file(char*& lineptr, size_t& n, FILE* file) {
if (lineptr == nullptr || n == nullptr || fp == nullptr) {
errno = EINVAL;
return -1;
}
char buff[get_line_initial_buffer_size]; char buff[get_line_initial_buffer_size];
if (*lineptr == nullptr || *n < sizeof(buff)) { if (lineptr == nullptr || n < sizeof(buff)) {
size_t new_n = sizeof(buff); size_t new_n = sizeof(buff);
*lineptr = static_cast<char*>(strict_realloc(*lineptr, new_n)); lineptr = static_cast<char*>(strict_realloc(lineptr, new_n));
*n = new_n; n = new_n;
} }
(*lineptr)[0] = '\0'; lineptr[0] = '\0';
size_t line_used = 0; size_t line_used = 0;
while (std::fgets(buff, sizeof(buff), fp) != nullptr) { while (std::fgets(buff, sizeof(buff), file) != nullptr) {
line_used = std::strlen(*lineptr); line_used = std::strlen(lineptr);
size_t buff_used = std::strlen(buff); size_t buff_used = std::strlen(buff);
if (*n <= buff_used + line_used) { if (n <= buff_used + line_used) {
size_t new_n = *n * 2; size_t new_n = n * 2;
*lineptr = static_cast<char*>(strict_realloc(*lineptr, new_n)); lineptr = static_cast<char*>(strict_realloc(lineptr, new_n));
*n = new_n; n = new_n;
} }
std::memcpy(*lineptr + line_used, buff, buff_used); std::memcpy(lineptr + line_used, buff, buff_used);
line_used += buff_used; line_used += buff_used;
(*lineptr)[line_used] = '\0'; lineptr[line_used] = '\0';
if ((*lineptr)[line_used - 1] == '\n') { if (lineptr[line_used - 1] == '\n') {
return line_used; return line_used;
} }
} }
@ -698,6 +693,70 @@ ssize_t get_line_file(char** lineptr, size_t* n, FILE* fp) {
#endif #endif
ssize_t get_line_buffer(char*& lineptr, size_t& n,
const char* const csv_data_buffer, size_t csv_data_size,
size_t& curr_char) {
if (curr_char >= csv_data_size) {
return -1;
}
if (lineptr == nullptr || n < get_line_initial_buffer_size) {
auto new_lineptr = static_cast<char*>(
strict_realloc(lineptr, get_line_initial_buffer_size));
lineptr = new_lineptr;
n = get_line_initial_buffer_size;
}
size_t line_used = 0;
while (curr_char < csv_data_size) {
if (line_used + 1 >= n) {
size_t new_n = n * 2;
char* new_lineptr =
static_cast<char*>(strict_realloc(lineptr, new_n));
n = new_n;
lineptr = new_lineptr;
}
auto c = csv_data_buffer[curr_char++];
lineptr[line_used++] = c;
if (c == '\n') {
lineptr[line_used] = '\0';
return line_used;
}
}
if (line_used != 0) {
lineptr[line_used] = '\0';
return line_used;
}
return -1;
}
std::tuple<ssize_t, bool> get_line(char*& buffer, size_t& buffer_size,
FILE* file,
const char* const csv_data_buffer,
size_t csv_data_size, size_t& curr_char) {
ssize_t ssize;
if (file) {
ssize = get_line_file(buffer, buffer_size, file);
curr_char = std::ftell(file);
} else {
ssize = get_line_buffer(buffer, buffer_size, csv_data_buffer,
csv_data_size, curr_char);
}
if (ssize == -1) {
if (errno == ENOMEM) {
throw std::bad_alloc{};
}
return {ssize, true};
}
return {ssize, false};
}
} /* ss */ } /* ss */
namespace ss { namespace ss {
@ -2925,46 +2984,9 @@ private:
reader(const reader& other) = delete; reader(const reader& other) = delete;
reader& operator=(const reader& other) = delete; reader& operator=(const reader& other) = delete;
ssize_t get_line_buffer(char** lineptr, size_t* n,
const char* const csv_data_buffer,
size_t csv_data_size, size_t& curr_char) {
if (curr_char >= csv_data_size) {
return -1;
}
if (*lineptr == nullptr || *n < get_line_initial_buffer_size) {
auto new_lineptr = static_cast<char*>(
strict_realloc(*lineptr, get_line_initial_buffer_size));
*lineptr = new_lineptr;
*n = get_line_initial_buffer_size;
}
size_t line_used = 0;
while (curr_char <= csv_data_size) {
if (line_used + 1 >= *n) {
size_t new_n = *n * 2;
char* new_lineptr =
static_cast<char*>(strict_realloc(*lineptr, new_n));
*n = new_n;
*lineptr = new_lineptr;
}
auto c = csv_data_buffer[curr_char++];
(*lineptr)[line_used++] = c;
if (c == '\n') {
(*lineptr)[line_used] = '\0';
return line_used;
}
}
return (line_used != 0) ? line_used : -1;
}
// read next line each time in order to set eof_ // read next line each time in order to set eof_
bool read_next() { bool read_next() {
next_line_converter_.clear_error(); next_line_converter_.clear_error();
ssize_t ssize = 0;
size_t size = 0; size_t size = 0;
while (size == 0) { while (size == 0) {
++line_number_; ++line_number_;
@ -2973,21 +2995,11 @@ private:
} }
chars_read_ = curr_char_; chars_read_ = curr_char_;
if (file_) { auto [ssize, eof] =
ssize = get_line_file(&next_line_buffer_, get_line(next_line_buffer_, next_line_buffer_size_, file_,
&next_line_buffer_size_, file_); csv_data_buffer_, csv_data_size_, curr_char_);
curr_char_ = std::ftell(file_);
} else {
ssize = get_line_buffer(&next_line_buffer_,
&next_line_buffer_size_,
csv_data_buffer_, csv_data_size_,
curr_char_);
}
if (ssize == -1) { if (eof) {
if (errno == ENOMEM) {
throw std::bad_alloc{};
}
return false; return false;
} }
@ -3129,18 +3141,12 @@ private:
bool append_next_line_to_buffer(char*& buffer, size_t& size) { bool append_next_line_to_buffer(char*& buffer, size_t& size) {
undo_remove_eol(buffer, size); undo_remove_eol(buffer, size);
ssize_t next_ssize; chars_read_ = curr_char_;
if (file_) { auto [next_ssize, eof] =
next_ssize = get_line(helper_buffer_, helper_buffer_size, file_,
get_line_file(&helper_buffer_, &helper_buffer_size, file_); csv_data_buffer_, csv_data_size_, curr_char_);
} else {
next_ssize =
get_line_buffer(&helper_buffer_, &helper_buffer_size,
csv_data_buffer_, csv_data_size_,
curr_char_);
}
if (next_ssize == -1) { if (eof) {
return false; return false;
} }