Skip to content

Possible fix for CRAN warning #776

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
hadley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Possible fix for CRAN warning #776

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/cpp11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ extern "C" SEXP _haven_write_xpt_(SEXP data, SEXP path, SEXP version, SEXP name,

extern "C" {
/* .Call calls */
extern SEXP is_tagged_na_(void *, void *);
extern SEXP na_tag_(void *);
extern SEXP tagged_na_(void *);
extern SEXP is_tagged_na_(SEXP, SEXP);
extern SEXP na_tag_(SEXP);
extern SEXP tagged_na_(SEXP);

static const R_CallMethodDef CallEntries[] = {
{"_haven_df_parse_dta_file", (DL_FUNC) &_haven_df_parse_dta_file, 6},
Expand Down
8 changes: 5 additions & 3 deletions src/readstat/spss/readstat_por_write.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,12 @@ static readstat_error_t por_emit_header(readstat_writer_t *writer, por_write_ctx
memset(vanity, '0', sizeof(vanity));

memcpy(vanity[1], "ASCII SPSS PORT FILE", 20);
strncpy(vanity[1] + 20, writer->file_label, 20);
if (file_label_len < 20)
if (file_label_len >= 20) {
memcpy(vanity[1] + 20, writer->file_label, 20);
} else {
memcpy(vanity[1] + 20, writer->file_label, file_label_len);
memset(vanity[1] + 20 + file_label_len, ' ', 20 - file_label_len);

}
por_write_bytes(writer, vanity, sizeof(vanity));

char lookup[256];
Expand Down
Loading