Skip to contentSkip to conversation

ustr cleanups (policyrep branch)

PATCH In review James Antill 3 participants 4 messages Oct 1, 2007 – Oct 5, 2007 SELinux security module

lore
Share & tools
lore

James Antill

author
#0 lore raw

PATCH 1/1 ustr cleanups (policyrep branch)

Here are two cleanups for ustr usage within libsemanage on the
policyrep branch.

The first is a corner case where you have two or more replacements in
the "replace_all" function of genhomedircon, previously one of those multiple replacements (in theory) could fail due to malloc() returning NULL and that would be missed. The fix probably makes the free test more readable too.

The second is that semanage_is_prefix() was previously defined by
calling ustr functions (inefficiently, even), and so had to allocate a ustr to do it's work ... the fix just calls strncmp() directly.

Signature · 1 line
James Antill <[email protected]>
branches/policyrep/libsemanage/src/genhomedircon.c +4 -4
index 68dedc8..f4cc16b 100644
@@ -322,7 +322,7 @@ static semanage_list_t *make_template(genhomedircon_settings_t * s,
 static Ustr *replace_all(const char *str, const replacement_pair_t * repl)
 {
 	Ustr *retval = USTR_NULL;
-	int i, num_replaced = 0;
+	int i;
 
 	if (!str || !repl)
 		goto done;

@@ -330,10 +330,10 @@ static Ustr *replace_all(const char *str, const replacement_pair_t * repl)
 		goto done;
 
 	for (i = 0; repl[i].search_for; i++) {
-		num_replaced += ustr_replace_cstr(&retval, repl[i].search_for,
-						  repl[i].replace_with, 0);
+		ustr_replace_cstr(&retval, repl[i].search_for,
+				  repl[i].replace_with, 0);
 	}
-	if (!num_replaced)
+	if (ustr_enomem(retval))
 		ustr_sc_free(&retval);
 
       done:
branches/policyrep/libsemanage/src/utilities.c +1 -9
index 6a997e9..349a4be 100644
@@ -60,22 +60,14 @@ char *semanage_findval(char *file, char *var, char *delim)
 
 int semanage_is_prefix(const char *str, const char *prefix)
 {
-	int retval;
-	Ustr *ustr = USTR_NULL;
-
 	if (!str) {
 		return FALSE;
 	}
 	if (!prefix) {
 		return TRUE;
 	}
-	if (!(ustr = ustr_dup_cstr(str))) {
-		return FALSE;
-	}
-	retval = (ustr_srch_cstr_fwd(ustr, 0, prefix) == 1);
-	ustr_sc_free(&ustr);
 
-	return retval;
+	return strncmp(str, prefix, strlen(prefix)) == 0;
 }
 
 char *semanage_split_on_space(const char *str)
#1 lore raw
Quoted 9 lines · James Antill

Here are two cleanups for ustr usage within libsemanage on the
policyrep branch.

The first is a corner case where you have two or more replacements in
the "replace_all" function of genhomedircon, previously one of those multiple replacements (in theory) could fail due to malloc() returning NULL and that would be missed. The fix probably makes the free test more readable too.

Quoted 3 lines

The second is that semanage_is_prefix() was previously defined by
calling ustr functions (inefficiently, even), and so had to allocate a ustr to do it's work ... the fix just calls strncmp() directly.

That looks sane to me. Is there a reason you based this off of policyrep instead of trunk?

- todd

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

author
#2 lore raw
Quoted 2 lines · Todd Miller

That looks sane to me. Is there a reason you based this off of policyrep instead of trunk?

Just me not having used SVN much, I did a search for ustr in the
branches directory and went from there ... didn't even notice the top level trunk directory.
The patch seems to apply without conflicts with -p3 from inside the
trunk dir.

Signature · 1 line
James Antill <[email protected]>
#3 lore raw
In reply to James Antill
Quoted 9 lines · James Antill

Here are two cleanups for ustr usage within libsemanage on the policyrep branch.

The first is a corner case where you have two or more replacements in
the "replace_all" function of genhomedircon, previously one of those multiple replacements (in theory) could fail due to malloc() returning NULL and that would be missed. The fix probably makes the free test more readable too.

Quoted 3 lines

The second is that semanage_is_prefix() was previously defined by
calling ustr functions (inefficiently, even), and so had to allocate a ustr to do it's work ... the fix just calls strncmp() directly.

Thanks, merged on trunk.

Signature · 8 lines
Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.