Skip to content

Return safely when trimming an empty string #324

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.

Sign up for GitHub

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

Open
dajiaohuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return safely when trimming an empty string #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion common_func.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@ char* str_tolower(const char* str)
*/
char* str_trim(char* str)
{
char* last = str + strlen(str) - 1;
char* last;
while (isspace((unsigned char)*str)) str++;
if (!*str) return str;
last = str + strlen(str) - 1;
while (isspace((unsigned char)*last) && last > str) *(last--) = 0;
return str;
}
Expand Down
19 changes: 19 additions & 0 deletions tests/test_empty_config_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env python3
from pathlib import Path
import os
import subprocess
import sys
import tempfile

binary = str(Path(sys.argv[1]).resolve())
with tempfile.TemporaryDirectory() as directory:
config = Path(directory, "rhash", "rhashrc")
config.parent.mkdir()
config.write_text("=ignored\nsha256=on\n")
env = dict(os.environ, XDG_CONFIG_HOME=directory)
result = subprocess.run([binary, "--message=abc"], env=env,
capture_output=True, text=True, timeout=10)
assert result.returncode == 0, (result.returncode, result.stderr)
assert "unknown option" in result.stderr, result.stderr
assert "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" in result.stdout, result.stdout
print("PASS: empty configuration name warns and subsequent SHA-256 option works")
Loading