Changeset 624

Timestamp:

09/07/08 09:55:15 (5 months ago)

Author:

smoku

Message:

Merged pointer size overflow patch. Fixes #231

Files:

• trunk/sx/sasl_gsasl.c (modified) (7 diffs)

trunk/sx/sasl_gsasl.c

@@ -271 +271 @@
     char *buf = NULL, *out = NULL, *realm = NULL, *ext_id;
     char hostname[256];
-    int buflen, outlen, ret, i;
+    int ret, i;
+    size_t buflen, outlen;
 
     if(mech != NULL) {
@@ -336 +337 @@
         }
 
-        ret = gsasl_step(sd, buf, buflen, &out, (size_t *) &outlen);
+        ret = gsasl_step(sd, buf, buflen, &out, &outlen);
         if(ret != GSASL_OK && ret != GSASL_NEEDS_MORE) {
             _sx_debug(ZONE, "gsasl_step failed, no sasl for this conn; (%d): %s", ret, gsasl_strerror(ret));
@@ -356 +357 @@
         }
         _sx_debug(ZONE, "response from client (decoded: %.*s)", buflen, buf);
-        ret = gsasl_step(sd, buf, buflen, &out, (size_t *) &outlen);
+        ret = gsasl_step(sd, buf, buflen, &out, &outlen);
     }
 
@@ -405 +406 @@
 static void _sx_sasl_server_process(sx_t s, sx_plugin_t p, Gsasl_session *sd, char *in, int inlen) {
     char *buf, *out;
-    int buflen, outlen, ret;
+    size_t buflen, outlen;
+    int ret;
 
     _sx_debug(ZONE, "data from client");
@@ -414 +416 @@
 
     /* process the data */
-    ret = gsasl_step(sd, buf, buflen, &out, (size_t *) &outlen);
+    ret = gsasl_step(sd, buf, buflen, &out, &outlen);
     if(buf != NULL) free(buf);
 
@@ -722 +724 @@
     char *buf, *out;
     char hostname[256];
-    int ret, buflen, outlen, ns;
+    int ret, ns;
+    size_t buflen, outlen;
     nad_t nad;
 
@@ -758 +761 @@
 
     /* handshake step */
-    ret = gsasl_step(sd, NULL, 0, &out, (size_t *) &outlen);
+    ret = gsasl_step(sd, NULL, 0, &out, &outlen);
     if(ret != GSASL_OK && ret != GSASL_NEEDS_MORE) {
         _sx_debug(ZONE, "gsasl_step failed, not authing; (%d): %s", ret, gsasl_strerror(ret));