Skip to content

Fix segfault when column header is skipped - #3546

Closed
mdboom wants to merge 3 commits into
astropy:masterfrom
mdboom:ascii/realloc
Closed

mdboom wants to merge 3 commits into
astropy:masterfrom
mdboom:ascii/realloc

Conversation

@mdboom

@mdboom mdboom commented Feb 24, 2015

Copy link
Copy Markdown
Contributor

Hopefully addresses #3545.

@mdboom

mdboom commented Feb 24, 2015

Copy link
Copy Markdown
Contributor Author

This will probably have a merge conflict with #3525 -- just a note in case we want to merge in a particular order.

@embray

embray commented Feb 24, 2015

Copy link
Copy Markdown
Member

Changelog entry nag, and this can be merged :D

@mdboom

mdboom commented Feb 24, 2015

Copy link
Copy Markdown
Contributor Author

Sure -- I wouldn't mind getting confirmation from @martynbristow that this works for him first, as well.

@martynbristow

Copy link
Copy Markdown

Hello

I’m just trying to check it through
I’ve just received a Python(2483,0x7fff7c18c300) malloc: *** error for object 0x100306d10: incorrect checksum for freed object - object was probably modified after being freed.
*** set a breakpoint in malloc_error_break to debug
Abort trap: 6
I’ll see if its something I have done, as I have my real satrapy here too
Martyn Bristow
Mobile Tel: (+44) 7825 165-420
About Me: http://about.me/marty.mcfly http://about.me/marty.mcfly
Webpage:- http://www.martynbristow.co.uk http://www.martynbristow.co.uk/
E-mail:- [email protected] mailto:[email protected]
E-mail:- [email protected] mailto:[email protected]

On 24 Feb 2015, at 18:41, Michael Droettboom [email protected] wrote:

Sure -- I wouldn't mind getting confirmation from @martynbristow https://github.com/martynbristow that this works for him first, as well.

—
Reply to this email directly or view it on GitHub #3546 (comment).

@taldcroft

Copy link
Copy Markdown
Member

@mdboom - works for me, thanks! After doing this I get the expected exception (because the data file is really malformed for the tab format):

CParserError: an error occurred while parsing table data: too many columns found in line 1 of data

@martynbristow

Copy link
Copy Markdown

Yeah brilliant
All fixed, plus it now compensates for stupid text headers ;)

On 24 Feb 2015, at 18:56, Tom Aldcroft [email protected] wrote:

@mdboom https://github.com/mdboom - works for me, thanks! After doing this I get the expected exception (because the data file is really malformed for the tab format):

CParserError: an error occurred while parsing table data: too many columns found in line 1 of data
—
Reply to this email directly or view it on GitHub #3546 (comment).

@embray

embray commented Feb 25, 2015

Copy link
Copy Markdown
Member

As feared, this needs to be rebased now.

@embray

embray commented Mar 4, 2015

Copy link
Copy Markdown
Member

@mdboom Can you rebase this? If you're not around no problem though, I'll just merge by hand.

@mdboom

mdboom commented Mar 4, 2015

Copy link
Copy Markdown
Contributor Author

Rebased.

@embray

embray commented Mar 6, 2015

Copy link
Copy Markdown
Member

Oh, I think this broke as a result of the changes I made to the tests in #3525.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This needs to be changed to pass in read_tab as an argument, as it is now a fixture--somewhat odd I admit. Sorry 'bout that.

@embray

embray commented Mar 6, 2015

Copy link
Copy Markdown
Member

FWIW I fixed that up and rebased it--the new branch is testing here: https://travis-ci.org/embray/astropy/builds/53374609

Looks like it should pass, then I'll merge.

embray added a commit that referenced this pull request Mar 6, 2015
@embray

embray commented Mar 6, 2015

Copy link
Copy Markdown
Member

Manually merged in 00d223f.

@embray embray closed this Mar 6, 2015
embray added a commit that referenced this pull request Mar 6, 2015
Conflicts:
	astropy/io/ascii/src/tokenizer.c
@mdboom

mdboom commented Mar 6, 2015

Copy link
Copy Markdown
Contributor Author

Thanks!

@taldcroft

Copy link
Copy Markdown
Member

Thanks both!!

dhomeier pushed a commit to dhomeier/astropy that referenced this pull request Mar 31, 2015
Conflicts:
	astropy/io/ascii/src/tokenizer.c
dhomeier pushed a commit to dhomeier/astropy that referenced this pull request Mar 31, 2015
Conflicts:
	astropy/io/ascii/src/tokenizer.c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants