Skip to content
GitLab

Fix NPE in ModelUtils.isFreeFormObject()

Merged Administrator requested to merge github/fork/padamstx/padamstx/issue-1624 into master

Created by: padamstx

Fixes https://github.com/OpenAPITools/openapi-generator/issues/1624

An object schema containing no properties that also has additionalProperties set to an object schema with no properties will cause ModelUtils.isFreeFormObject to throw an NPE. This PR adds additional checking to avoid the NPE.

PR checklist

  • [X ] Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • [X ] Filed the PR against the correct branch: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

The change essentially just adds an extra check to make sure the "additionalProperties" schema's properties list is not null before calling "isEmpty()" on it.