Skip to content
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.

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

Prevent crashing when display.ini is missing end # #22471

Merged

Conversation

s-hadinger
Copy link
Collaborator

Description:

@gemu2015 This fix avoids a crash when display.ini is lacking the final #

Here, when strchr returns NULL, we can't call again strchr with NULL pointer:

lp = strchr(lp, '\n');
      if (!lp) {
        lp = strchr(lp, ' ');

Can you please check my fix?

Checklist:

  • The pull request is done against the latest development branch
  • Only relevant files were touched
  • Only one feature/fix was added per PR and the code change compiles without warnings
  • The code change is tested and works with Tasmota core ESP8266 V.2.7.8
  • The code change is tested and works with Tasmota core ESP32 V.3.1.0.241030
  • I accept the CLA.

NOTE: The code change must pass CI tests. Your PR cannot be merged unless tests pass

Copy link
Contributor

@gemu2015 gemu2015 left a comment

Choose a reason for hiding this comment

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

should be fixed now

@s-hadinger s-hadinger merged commit dd99642 into arendst:development Nov 14, 2024
59 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants