Improve warning when returning null from the resolver set by libxml_set_external_entity_loader #12022
Conversation
…et_external_entity_loader Fixes phpGH-11952.
| php_libxml_ctx_error(context, | ||
| "Failed to load external entity because the resolver function returned null\n"); |
There was a problem hiding this comment.
Wouldn't it make more sense to move this warning where the RETVAL is handled?
There was a problem hiding this comment.
I don't know. There are quite a few possible paths that lead to this branch. I think refactoring that complicates things more than what we gain? I could be wrong or misunderstanding ofc.
There was a problem hiding this comment.
I was thinking of just moving the warning for the null type where the // else retval is null comment is.
But that might complicate the logic for the rest :/
There was a problem hiding this comment.
Right I see, but then we'll still need a NULL-check for ID at line 786 so we don't get a double warning (and a NULL deref of ID). So I don't think we gain much by that. I prefer to keep the structure as-is.
…et_external_entity_loader Fixes phpGH-11952. Closes phpGH-12022.
2 participants
Fixes GH-11952.