www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity

https://bz.apache.org/bugzilla/show_bug.cgi?id=58855

Browse Source 
Optimize check for empty strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778067 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2017-01-09 22:08:01 +00:00
parent db852eb4ce
commit cc97ce3e52
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/aaa/mod_authnz_fcgi.c
View File

@@ -855,7 +855,7 @@ static int fcgi_check_authn(request_rec *r)
const char *err; const char *err;
const char *user = ap_expr_str_exec(r, dconf->user_expr, const char *user = ap_expr_str_exec(r, dconf->user_expr,
&err); &err);
if (user && strlen(user)) { if (user && *user) {
r->user = apr_pstrdup(r->pool, user); r->user = apr_pstrdup(r->pool, user);
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
APLOGNO(02519) "%s: Setting user to '%s'", APLOGNO(02519) "%s: Setting user to '%s'",

22
modules/aaa/mod_authnz_ldap.c
View File

@@ -748,13 +748,13 @@ static authz_status ldapuser_check_authorization(request_rec *r,
*/ */
if (!strlen(r->user)) { if (!*r->user) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01699) ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01699)
"ldap authorize: Userid is blank, AuthType=%s", "ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type); r->ap_auth_type);
} }
if (req->dn == NULL || strlen(req->dn) == 0) { if (req->dn == NULL || !*req->dn) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01702) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01702)
"auth_ldap authorize: require user: user's DN has not " "auth_ldap authorize: require user: user's DN has not "
"been defined; failing authorization"); "been defined; failing authorization");
@@ -910,7 +910,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
* and populated with the userid and DN of the account in LDAP * and populated with the userid and DN of the account in LDAP
*/ */
if (!strlen(r->user)) { if (!*r->user) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01709) ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01709)
"ldap authorize: Userid is blank, AuthType=%s", "ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type); r->ap_auth_type);
@@ -920,7 +920,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
ent = (struct mod_auth_ldap_groupattr_entry_t *) sec->groupattr->elts; ent = (struct mod_auth_ldap_groupattr_entry_t *) sec->groupattr->elts;
if (sec->group_attrib_is_dn) { if (sec->group_attrib_is_dn) {
if (req->dn == NULL || strlen(req->dn) == 0) { if (req->dn == NULL || !*req->dn) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01712) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01712)
"auth_ldap authorize: require group: user's DN has " "auth_ldap authorize: require group: user's DN has "
"not been defined; failing authorization for user %s", "not been defined; failing authorization for user %s",
@@ -929,7 +929,7 @@ static authz_status ldapgroup_check_authorization(request_rec *r,
} }
} }
else { else {
if (req->user == NULL || strlen(req->user) == 0) { if (req->user == NULL || !*req->user) {
/* We weren't called in the authentication phase, so we didn't have a /* We weren't called in the authentication phase, so we didn't have a
* chance to set the user field. Do so now. */ * chance to set the user field. Do so now. */
req->user = r->user; req->user = r->user;
@@ -1063,7 +1063,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
* and populated with the userid and DN of the account in LDAP * and populated with the userid and DN of the account in LDAP
*/ */
if (!strlen(r->user)) { if (!*r->user) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01722) ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01722)
"ldap authorize: Userid is blank, AuthType=%s", "ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type); r->ap_auth_type);
@@ -1091,7 +1091,7 @@ static authz_status ldapdn_check_authorization(request_rec *r,
t = require; t = require;
if (req->dn == NULL || strlen(req->dn) == 0) { if (req->dn == NULL || !*req->dn) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01725) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01725)
"auth_ldap authorize: require dn: user's DN has not " "auth_ldap authorize: require dn: user's DN has not "
"been defined; failing authorization"); "been defined; failing authorization");
@@ -1163,7 +1163,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
* and populated with the userid and DN of the account in LDAP * and populated with the userid and DN of the account in LDAP
*/ */
if (!strlen(r->user)) { if (!*r->user) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01730) ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01730)
"ldap authorize: Userid is blank, AuthType=%s", "ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type); r->ap_auth_type);
@@ -1181,7 +1181,7 @@ static authz_status ldapattribute_check_authorization(request_rec *r,
ldc = get_connection_for_authz(r, LDAP_COMPARE); ldc = get_connection_for_authz(r, LDAP_COMPARE);
} }
if (req->dn == NULL || strlen(req->dn) == 0) { if (req->dn == NULL || !*req->dn) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01733) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01733)
"auth_ldap authorize: require ldap-attribute: user's DN " "auth_ldap authorize: require ldap-attribute: user's DN "
"has not been defined; failing authorization"); "has not been defined; failing authorization");
@@ -1272,7 +1272,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
* and populated with the userid and DN of the account in LDAP * and populated with the userid and DN of the account in LDAP
*/ */
if (!strlen(r->user)) { if (!*r->user) {
ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01739) ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01739)
"ldap authorize: Userid is blank, AuthType=%s", "ldap authorize: Userid is blank, AuthType=%s",
r->ap_auth_type); r->ap_auth_type);
@@ -1290,7 +1290,7 @@ static authz_status ldapfilter_check_authorization(request_rec *r,
ldc = get_connection_for_authz(r, LDAP_SEARCH); ldc = get_connection_for_authz(r, LDAP_SEARCH);
} }
if (req->dn == NULL || strlen(req->dn) == 0) { if (req->dn == NULL || !*req->dn) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01742) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01742)
"auth_ldap authorize: require ldap-filter: user's DN " "auth_ldap authorize: require ldap-filter: user's DN "
"has not been defined; failing authorization"); "has not been defined; failing authorization");

4
modules/http2/h2_config.c
View File

@@ -309,7 +309,7 @@ static const char *h2_conf_set_stream_max_mem_size(cmd_parms *parms,
static const char *h2_add_alt_svc(cmd_parms *parms, static const char *h2_add_alt_svc(cmd_parms *parms,
void *arg, const char *value) void *arg, const char *value)
{ {
if (value && strlen(value)) { if (value && *value) {
h2_config *cfg = (h2_config *)h2_config_sget(parms->server); h2_config *cfg = (h2_config *)h2_config_sget(parms->server);
h2_alt_svc *as = h2_alt_svc_parse(value, parms->pool); h2_alt_svc *as = h2_alt_svc_parse(value, parms->pool);
if (!as) { if (!as) {
@@ -407,7 +407,7 @@ static const char *h2_conf_add_push_priority(cmd_parms *cmd, void *_cfg,
h2_priority *priority; h2_priority *priority;
int weight; int weight;
if (!strlen(ctype)) { if (!*ctype) {
return "1st argument must be a mime-type, like 'text/css' or '*'"; return "1st argument must be a mime-type, like 'text/css' or '*'";
} }

2
modules/ldap/util_ldap_cache_mgr.c
View File

@@ -674,7 +674,7 @@ char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st)
return NULL; return NULL;
} }
if (r->args && strlen(r->args)) { if (r->args && *r->args) {
char cachetype[5], lint[2]; char cachetype[5], lint[2];
unsigned int id, off; unsigned int id, off;
char date_str[APR_CTIME_LEN]; char date_str[APR_CTIME_LEN];

2
modules/loggers/mod_log_config.c
View File

@@ -377,7 +377,7 @@ static const char *log_remote_user(request_rec *r, char *a)
if (rvalue == NULL) { if (rvalue == NULL) {
rvalue = "-"; rvalue = "-";
} }
else if (strlen(rvalue) == 0) { else if (!*rvalue) {
rvalue = "\"\""; rvalue = "\"\"";
} }
else { else {

2
modules/lua/lua_dbd.c
View File

@@ -782,7 +782,7 @@ int lua_db_acquire(lua_State *L)
arguments = lua_tostring(L, 3); arguments = lua_tostring(L, 3);
lua_settop(L, 0); lua_settop(L, 0);
if (strlen(arguments)) { if (*arguments) {
rc = apr_dbd_open_ex(dbdhandle->driver, pool, rc = apr_dbd_open_ex(dbdhandle->driver, pool,
arguments, &dbdhandle->handle, &error); arguments, &dbdhandle->handle, &error);
if (rc == APR_SUCCESS) { if (rc == APR_SUCCESS) {

6
modules/lua/lua_request.c
View File

@@ -382,7 +382,7 @@ static int req_parsebody(lua_State *L)
sscanf(start + len + 2, sscanf(start + len + 2,
"Content-Disposition: form-data; name=\"%255[^\"]\"; filename=\"%255[^\"]\"", "Content-Disposition: form-data; name=\"%255[^\"]\"; filename=\"%255[^\"]\"",
key, filename); key, filename);
if (strlen(key)) { if (*key) {
req_aprtable2luatable_cb_len(L, key, buffer, vlen); req_aprtable2luatable_cb_len(L, key, buffer, vlen);
} }
} }
@@ -2110,8 +2110,8 @@ static int lua_set_cookie(lua_State *L)
secure ? "Secure;" : "", secure ? "Secure;" : "",
expires ? strexpires : "", expires ? strexpires : "",
httponly ? "HttpOnly;" : "", httponly ? "HttpOnly;" : "",
strlen(strdomain) ? strdomain : "", *strdomain ? strdomain : "",
strlen(strpath) ? strpath : ""); *strpath ? strpath : "");
apr_table_add(r->err_headers_out, "Set-Cookie", out); apr_table_add(r->err_headers_out, "Set-Cookie", out);
return 0; return 0;

8
modules/proxy/mod_proxy_balancer.c
View File

@@ -1100,13 +1100,13 @@ static int balancer_handler(request_rec *r)
} }
} }
if ((val = apr_table_get(params, "w_wr"))) { if ((val = apr_table_get(params, "w_wr"))) {
if (strlen(val) && strlen(val) < sizeof(wsel->s->route)) if (*val && strlen(val) < sizeof(wsel->s->route))
strcpy(wsel->s->route, val); strcpy(wsel->s->route, val);
else else
*wsel->s->route = '\0'; *wsel->s->route = '\0';
} }
if ((val = apr_table_get(params, "w_rr"))) { if ((val = apr_table_get(params, "w_rr"))) {
if (strlen(val) && strlen(val) < sizeof(wsel->s->redirect)) if (*val && strlen(val) < sizeof(wsel->s->redirect))
strcpy(wsel->s->redirect, val); strcpy(wsel->s->redirect, val);
else else
*wsel->s->redirect = '\0'; *wsel->s->redirect = '\0';
@@ -1165,13 +1165,13 @@ static int balancer_handler(request_rec *r)
} }
} }
if ((val = apr_table_get(params, "w_hu"))) { if ((val = apr_table_get(params, "w_hu"))) {
if (strlen(val) && strlen(val) < sizeof(wsel->s->hcuri)) if (*val && strlen(val) < sizeof(wsel->s->hcuri))
strcpy(wsel->s->hcuri, val); strcpy(wsel->s->hcuri, val);
else else
*wsel->s->hcuri = '\0'; *wsel->s->hcuri = '\0';
} }
if (hc_valid_expr_f && (val = apr_table_get(params, "w_he"))) { if (hc_valid_expr_f && (val = apr_table_get(params, "w_he"))) {
if (strlen(val) && hc_valid_expr_f(r, val) && strlen(val) < sizeof(wsel->s->hcexpr)) if (*val && hc_valid_expr_f(r, val) && strlen(val) < sizeof(wsel->s->hcexpr))
strcpy(wsel->s->hcexpr, val); strcpy(wsel->s->hcexpr, val);
else else
*wsel->s->hcexpr = '\0'; *wsel->s->hcexpr = '\0';