base64.c: Don't out-of-bounds printf("%s", &encoded[-1]).

[nmh] / sbr / oauth_prof.c

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index 7dbd4fdba7ac58ae3d3cf2d22a0a351f9c127ad2..b5416380934f9f864db28c272b1537ea726378b6 100644 (file)
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -76,7 +76,7 @@ update_svc_field(char **field, const char *base_name, const char *svc)
 }
 
 /* Update all service_info fields that are overridden in profile. */
 }
 
 /* Update all service_info fields that are overridden in profile. */

-static boolean
+static bool

 update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
           size_t errbuflen)
 {
 update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
           size_t errbuflen)
 {


@@ -85,7 +85,7 @@ update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
     if (svc->name == NULL) {                                             \
        snprintf(errbuf, errbuflen, "%s", #name " is missing");          \
        errbuf[errbuflen - 1] = '\0';                                    \
     if (svc->name == NULL) {                                             \
        snprintf(errbuf, errbuflen, "%s", #name " is missing");          \
        errbuf[errbuflen - 1] = '\0';                                    \

-        return FALSE;                                                    \
+        return false;                                                    \

     }
     update(scope);
     update(client_id);
     }
     update(scope);
     update(client_id);


@@ -103,10 +103,10 @@ update_svc(mh_oauth_service_info *svc, const char *svc_name, char *errbuf,
         svc->display_name = svc->name;
     }
 
         svc->display_name = svc->name;
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-boolean
+bool

 mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
                          char *errbuf, size_t errbuflen)
 {
 mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
                          char *errbuf, size_t errbuflen)
 {


@@ -117,18 +117,14 @@ mh_oauth_get_service_info(const char *svc_name, mh_oauth_service_info *svcinfo,
     svcinfo->client_secret = svcinfo->auth_endpoint = NULL;
     svcinfo->token_endpoint = svcinfo->redirect_uri = NULL;
 
     svcinfo->client_secret = svcinfo->auth_endpoint = NULL;
     svcinfo->token_endpoint = svcinfo->redirect_uri = NULL;
 

-    for (i = 0; i < (int) (sizeof SERVICES / sizeof SERVICES[0]); i++) {
+    for (i = 0; i < (int)DIM(SERVICES); i++) {

         if (strcmp(SERVICES[i].name, svc_name) == 0) {
             copy_svc(svcinfo, &SERVICES[i]);
             break;
         }
     }
 
         if (strcmp(SERVICES[i].name, svc_name) == 0) {
             copy_svc(svcinfo, &SERVICES[i]);
             break;
         }
     }
 

-    if (!update_svc(svcinfo, svc_name, errbuf, errbuflen)) {
-        return FALSE;
-    }
-
-    return TRUE;
+    return update_svc(svcinfo, svc_name, errbuf, errbuflen);

 }
 
 const char *
 }
 
 const char *