Changeset 17470

Timestamp:

08/10/12 19:02:51 (11 years ago)

Author:

nit

Message:

[titan] fixes

Location:

titan

Files:

• plugins/tithek/tithek.h (modified) (2 diffs)
• titan/rc4.h (modified) (3 diffs)

titan/plugins/tithek/tithek.h

@@ -728 +728 @@
                 struct splitstr* ret1 = NULL;
                 ret1 = strsplit(link, ";", &count);
-                if(ret1 != NULL)
+                if(ret1 != NULL && count >= 4)
                 {
                         link = ostrcat(ret1[0].part, NULL, 0, 0);
@@ -887 +887 @@
                 int hlen = 0;
 
-                if(ret1 != NULL)
+                if(ret1 != NULL && count >= 2)
                 {
 //                      printf("ret1[1].part=%s\n", (ret1[1]).part);
-                        hlen = strlen((ret1[1]).part);
+                        hlen = strlen(ret1[1].part);
                         tmpstr_uni = unhexlify(ret1[1].part);
                 }

titan/titan/rc4.h

@@ -9 +9 @@
 };
 
-#define SWAPRC4(a,b) { unsigned char temp; temp = (a); (a) = (b); (b) = temp; }
+#define SWAPRC4(a, b) { unsigned char temp; temp = (a); (a) = (b); (b) = temp; }
 
 void rc4init(struct rc4ctx *ctx, char *key, size_t keylen)
@@ -16 +16 @@
         unsigned char j = 0;
 
+        if(key == NULL) return;
+
         for(i = 0; i < sizeof(ctx->S); i++)
-        {
                 ctx->S[i] = i;
-        }
     
         for(i = 0; i < sizeof(ctx->S); i++)
@@ -31 +31 @@
 {
         unsigned int i;
+
+        if(data == NULL) return;
 
         ctx->i = 0;