Skip to content

Fix CFITSIO safety issues: nullptr params, error handling, nrow clamping, CI coverage #28

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

Merged
asgr merged 22 commits into from
Apr 1, 2026
Merged

Fix CFITSIO safety issues: nullptr params, error handling, nrow clamping, CI coverage #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7dca650
major fixes
asgr Mar 18, 2026
d6630ef
Minor changes
asgr Mar 18, 2026
19092b8
Some more optimisations
asgr Mar 18, 2026
1d0993f
Compiles fine
asgr Mar 18, 2026
daf7000
Clean up
asgr Mar 18, 2026
ca1f4f8
Final fresh pass and some last tidy ups. Compiles fine (fewer warnings).
asgr Mar 18, 2026
f6fb2c8
try now
asgr Mar 18, 2026
b448202
Type fix
asgr Mar 18, 2026
4067ea9
Safe
asgr Mar 18, 2026
ba8867f
Now?
asgr Mar 18, 2026
ea96187
Ignore devel version
asgr Mar 18, 2026
82b3505
Comment to stop future edits of this bit
asgr Mar 18, 2026
75b52d9
More fixes
asgr Mar 18, 2026
e3add52
Final tidy up.
asgr Mar 19, 2026
b497e7d
Just run workflow on main and master
asgr Mar 19, 2026
97f656c
Merge pull request #27 from asgr/master
asgr Mar 31, 2026
bc5142d
Minor edits (esp since I never actually used Cfits_read_nrow)
asgr Mar 31, 2026
cda45b4
Change to warning
asgr Mar 31, 2026
4abb4ab
Fix fits_close_file status ignored in move-assignment and fitsfile* a…
Copilot Apr 1, 2026
d3e7438
Address remaining PR review comments: hdrpos nullptr, nrow clamp, col…
Copilot Apr 1, 2026
c398e30
Some final edits
asgr Apr 1, 2026
cdf5b3f
Get rid of failing Ubuntu (seems to be their issue, not mine)
asgr Apr 1, 2026
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
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The matrix no longer runs ubuntu-latest with r: devel. This reduces forward-compatibility coverage and can delay detection of upcoming R changes. If CI time isn’t the driver, consider keeping the devel job or gating it (e.g., scheduled/weekly) instead of removing it entirely.

Suggested change
- {os: ubuntu-latest, r: 'oldrel-1'}
- {os: ubuntu-latest, r: 'oldrel-1'}
- {os: ubuntu-latest, r: 'devel'}

Copilot uses AI. Check for mistakes.
# - {os: ubuntu-latest, r: 'devel'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -44,9 +44,10 @@ jobs:
install.packages('hdf5r')
install.packages('knitr')
install.packages('rmarkdown')
install.packages('rlang')
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("rcmdcheck")
remotes::install_github("asgr/Rwcs", ref="master")
remotes::install_cran("rcmdcheck")
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: Rfits
Type: Package
Title: FITS Readers and Writers
Version: 1.14.5
Date: 2026-02-26
Version: 1.15.0
Date: 2026-04-01
Authors@R: c(
person(given='Aaron', family='Robotham', email='aaron.robotham@uwa.edu.au',
role=c('aut', 'cre'), comment=c(ORCID='0000-0003-0429-3579')),
Expand Down
1 change: 0 additions & 1 deletion R/Rfits_methods_file.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Rfits_pixscale = function(filename, ext=1, useraw=TRUE, unit='asec', loc='cen',
return(pixscale(temp_header, useraw=useraw, unit=unit, loc='cen', ...))
}


Rfits_pixarea = function(filename, ext=1, useraw=TRUE, unit='asec2', loc='cen', ...){
temp_header = Rfits_read_header(filename=filename, ext=ext)
return(pixarea(temp_header, useraw=useraw, unit=unit, loc='cen', ...))
Expand Down
6 changes: 3 additions & 3 deletions src/RcppExports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ BEGIN_RCPP
END_RCPP
}
// Cfits_read_nrow
int Cfits_read_nrow(Rcpp::String filename, int ext);
long Cfits_read_nrow(Rcpp::String filename, int ext);
RcppExport SEXP _Rfits_Cfits_read_nrow(SEXP filenameSEXP, SEXP extSEXP) {
BEGIN_RCPP
Rcpp::RObject rcpp_result_gen;
Expand Down Expand Up @@ -105,13 +105,13 @@ BEGIN_RCPP
END_RCPP
}
// Cfits_write_col
void Cfits_write_col(Rcpp::String filename, SEXP data, int nrow, int colref, int ext, int typecode);
void Cfits_write_col(Rcpp::String filename, SEXP data, long nrow, int colref, int ext, int typecode);
RcppExport SEXP _Rfits_Cfits_write_col(SEXP filenameSEXP, SEXP dataSEXP, SEXP nrowSEXP, SEXP colrefSEXP, SEXP extSEXP, SEXP typecodeSEXP) {
BEGIN_RCPP
Rcpp::RNGScope rcpp_rngScope_gen;
Rcpp::traits::input_parameter< Rcpp::String >::type filename(filenameSEXP);
Rcpp::traits::input_parameter< SEXP >::type data(dataSEXP);
Rcpp::traits::input_parameter< int >::type nrow(nrowSEXP);
Rcpp::traits::input_parameter< long >::type nrow(nrowSEXP);
Rcpp::traits::input_parameter< int >::type colref(colrefSEXP);
Rcpp::traits::input_parameter< int >::type ext(extSEXP);
Rcpp::traits::input_parameter< int >::type typecode(typecodeSEXP);
Expand Down
Loading
Loading