Skip to content
This repository was archived by the owner on Jan 17, 2023. It is now read-only.

Fixed crash when passing invalid JSON to request serialization #3719

Merged

Conversation

0xced
Copy link
Contributor

@0xced 0xced commented Sep 30, 2016

Fixes #3711

The NSURLErrorCannotDecodeContentData code is not ideal, but AFURLRequestSerializationErrorDomain should define its own error codes anyway.

@codecov-io
Copy link

codecov-io commented Oct 1, 2016

Current coverage is 87.50% (diff: 100%)

Merging #3719 into master will increase coverage by 0.01%

@@             master      #3719   diff @@
==========================================
  Files            45         45          
  Lines          6224       6240    +16   
  Methods        1099       1100     +1   
  Messages          0          0          
  Branches        414        416     +2   
==========================================
+ Hits           5445       5460    +15   
- Misses          776        777     +1   
  Partials          3          3          

Powered by Codecov. Last update 4429921...e2232e3

@kcharwood kcharwood added this to the 3.2.0 milestone Oct 3, 2016
@kcharwood
Copy link
Contributor

Could you rebase this with master to get Xcode 8 test support?

@0xced 0xced force-pushed the fix-invalid-json-serialization-crash branch from 2f4ed66 to 27c755b Compare October 7, 2016 13:25
@0xced
Copy link
Contributor Author

0xced commented Oct 7, 2016

Rebased.

@kcharwood kcharwood changed the title Do not crash when passing invalid JSON for serialization Fixed crash when passing invalid JSON for serialization Oct 10, 2016
@kcharwood
Copy link
Contributor

@0xced can you resolve the conflict?

@0xced
Copy link
Contributor Author

0xced commented Oct 10, 2016

Of course. Will do later today.

Fixes #3711

The `NSURLErrorCannotDecodeContentData` code is not ideal, but `AFURLRequestSerializationErrorDomain` should define its own error codes anyway.
@0xced 0xced force-pushed the fix-invalid-json-serialization-crash branch from 27c755b to e2232e3 Compare October 10, 2016 16:14
@kcharwood kcharwood changed the title Fixed crash when passing invalid JSON for serialization Fixed crash when passing invalid JSON to request serialization Oct 10, 2016
@kcharwood kcharwood merged commit 719a3bf into AFNetworking:master Oct 10, 2016
@kcharwood kcharwood added the bug label Oct 10, 2016
@0xced 0xced deleted the fix-invalid-json-serialization-crash branch October 11, 2016 21:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants