aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@users.noreply.github.com>2020-04-09 01:29:16 -0400
committerGitHub <noreply@github.com>2020-04-09 01:29:16 -0400
commitd36652a97046e7c5a626cb39e39f83172a85ff3e (patch)
tree95c6d4ab4a864a1cb743d456467bb29003815cc5
parent3ff0e986bee05be4abb3c49d2fddec0fa8ccfc59 (diff)
parent7c3bb64c4d04c05724f6d0c48b3e065f693fdc1d (diff)
downloadspmc-d36652a97046e7c5a626cb39e39f83172a85ff3e.tar.gz
Merge pull request #15 from jhunkeler/test-relocate-relocate
Test relocate relocate
-rw-r--r--lib/relocation.c13
-rw-r--r--tests/test_relocation_relocate.c47
2 files changed, 57 insertions, 3 deletions
diff --git a/lib/relocation.c b/lib/relocation.c
index 003b373..fa03aee 100644
--- a/lib/relocation.c
+++ b/lib/relocation.c
@@ -352,11 +352,18 @@ int prefixes_write(const char *output_file, int mode, char **prefix, const char
int relocate(const char *_filename, const char *_oldstr, const char *_newstr) {
int returncode;
Process *proc = NULL;
- char *oldstr = strdup(_oldstr);
- char *newstr = strdup(_newstr);
- char *filename = strdup(_filename);
+ char *filename = NULL;
+ char *oldstr = NULL;
+ char *newstr = NULL;
char cmd[PATH_MAX];
+ if (_filename == NULL || _oldstr == NULL || _newstr == NULL) {
+ return -1;
+ }
+
+ oldstr = strdup(_oldstr);
+ newstr = strdup(_newstr);
+ filename = strdup(_filename);
// sanitize command
strchrdel(oldstr, SHELL_INVALID);
strchrdel(newstr, SHELL_INVALID);
diff --git a/tests/test_relocation_relocate.c b/tests/test_relocation_relocate.c
new file mode 100644
index 0000000..a88af54
--- /dev/null
+++ b/tests/test_relocation_relocate.c
@@ -0,0 +1,47 @@
+#include "spm.h"
+#include "framework.h"
+
+const char *testFmt = "case '%s': returned '%s', expected '%s'\n";
+struct TestCase testCase[] = {
+ {.caseValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF", .arg[0].sptr = "...", .arg[1].sptr = ".", .truthValue.sptr = "\xFE\xFEThis is a test. Happy friend.\x00\xFF\xFF"},
+ {.caseValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF", .arg[0].sptr = "test", .arg[1].sptr = "win", .truthValue.sptr = "\xFE\xFEThis is a win... Happy friend.\x00\xFF\xFF"},
+ {.caseValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF", .arg[0].sptr = "This is a test", .arg[1].sptr = "Meow cat", .truthValue.sptr = "\xFE\xFEMeow cat... Happy friend.\x00\xFF\xFF"},
+ {.caseValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF", .arg[0].sptr = "T", .arg[1].sptr = "#", .truthValue.sptr = "\xFE\xFE#his is a test... Happy friend.\x00\xFF\xFF"},
+ {.caseValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF", .arg[0].sptr = "", .arg[1].sptr = "#", .truthValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF"},
+ {.caseValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF", .arg[0].sptr = "#", .arg[1].sptr = "", .truthValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF"},
+ {.caseValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF", .arg[0].sptr = "", .arg[1].sptr = "", .truthValue.sptr = "\xFE\xFEThis is a test... Happy friend.\x00\xFF\xFF"},
+};
+size_t numCases = sizeof(testCase) / sizeof(struct TestCase);
+
+int main(int argc, char *argv[]) {
+ for (size_t i = 0; i < numCases; i++) {
+ FILE *fp = NULL;
+ char buffer[BUFSIZ] = {0,};
+ char *caseValue = buffer;
+ int return_value = 0;
+ char filename[PATH_MAX] = {0,};
+ sprintf(filename, "%s.%s_%zu.mock", basename(__FILE__), __FUNCTION__, i);
+
+ mock(filename, (void *)testCase[i].caseValue.sptr, sizeof(char), strlen(testCase[i].caseValue.sptr));
+ return_value = relocate(filename, testCase[i].arg[0].sptr, testCase[i].arg[1].sptr);
+
+ fp = fopen(filename, "rb");
+ if (fp == NULL) {
+ perror(filename);
+ exit(1);
+ }
+
+ if (fread(caseValue, sizeof(char), BUFSIZ, fp) == 0) {
+ fprintf(stderr, "%s: read failure\n", filename);
+ fclose(fp);
+ exit(1);
+ }
+
+ myassert(return_value == 0, "reloc exited with error condition: %d\n", return_value);
+ myassert(strstr(caseValue, testCase[i].truthValue.sptr) != NULL, testFmt, testCase[i].caseValue.sptr, caseValue, testCase[i].truthValue.sptr);
+
+ // clean up
+ unlink(filename);
+ }
+ return 0;
+} \ No newline at end of file