Changeset dab82f29 for aim.c


Ignore:
Timestamp:
Mar 28, 2009, 5:00:34 PM (16 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
owl
Children:
4de643d
Parents:
5189631
Message:
Don't crash on mobile device AIM messages [BZ 20]
Don't crash when sending to someone not on AIM buddy list [BZ 94]
Fix overflow vulerability in zwrite.c and zcrypt.c
Add stack protector and -D_FORTIFY_SOURCE=2 where possible
Fix hang [barnowl 4c46dfdebc294ca24fef59924f01688b8ee07dee]
Fix segfault on missing subs [barnowl 99dabeed7de6d19acb50f1e73aa0bfe5f9469c02]
Fix zcrypt bufffer size bug [barnowl 559076cd86edc3a8317819814dd5877b8bc7c3cb]
Fix double free [barnowl e97c4a306ae2c9d2147d83da29fee59918198e70]
Memory leak fix [barnowl c0a90c2c7ab97b9465c9873757faf312faa0021e]
Memory leak fix [barnowl 95caa16b2e9ba10770d87d0955198c14c2d0e16a]
Memory leak fix [barnowl 1716fed8c2650e46892cf6571555eac937266c6e]
Add getstyle command [barnowl 216c73421653e3ef0e957aa9a9804e208a77c80e]
Binary search for msgid [barnowl 0c8ab5eadbb6ecc97a120c91b9a824b33538c764]
File-handle leak [barnowl e78397d6ac5da0de31a4e269c0ba7f3d691857a3]
Fix delay in jump from top to bottom [barnowl 801b7ac63b962640debbcfd422cb9a60da5fea31]
Load subs in chunks [barnowl 93e883d60051b80bf6d35391f9d76fd7dfd198e3]
Load subs in chunks [barnowl f6050ee9b0a171a5031f84409eb181062afacd18]
Better zsig logging [barnowl d857b667a5a9b108b1a2a26b4a5513bef2b53f80]
free() -> owlfree() [barnowl d524c838ac7c115628424b8ac171c3489622ea3a]
Escape AIM users in smartfilters [barnowl af9b92e3e7ccb7de276a94b5c7e5861b24e71eff]
Better regex escape chars [barnowl 80e54a7631f091be8c9762adb9746bad38104738]
Deal with quotes in smart filters [barnowl 4099cf83702763fa8d1efc4f1582a605431bdb77]
Deal with 0 length zephyr fields [barnowl 128171aaf7cefa91a4bb1eada93a19d8fd0c355c]
Deal with 0 length zephyr fields [barnowl 50e29e35c64d64e223d378d350a7bc4f038d78f5]
Deal with 0 length zephyr fields [barnowl 804ab8af8b6d00bcd7e2402df892db8fbd61a3ec]
Leave curmsg on screen after resize [barnowl c0f9e3009bc03e80a44de64cd5f2b4033290236e]
Rip out brower stuff [barnowl 8e5935d11c699a7ce5a3e6e9a47799564c696d6a]
Rip out browser stuff [barnowl 4f15e8e9ceada0d4b2cc969ebf43b0a1fb3709ea]
No passwords in command history [barnowl 6e400cc71aa59e041dce677aadf50dc1f25228e2]
Format NOC mssages [barnowl a1bb1980e4bca23b8329cc0e7c0bd5027055ea0a]
Expand ~ in loadsubs [barnowl 27d8d835dc6d58c08fae10e75aae306c49215143]
Expand ~ in source [barnowl 10d67d57cb29221f63a43a30643c697fc7b38911]
Only use resizeterm() if it's available
Debian backports
Change license to GPLv3
File:
1 edited

Legend:

Unmodified
Added
Removed

  • aim.c

    r9854278 rdab82f29  
     1/* Copyright (c) 2002,2003,2004,2009 James M. Kretchmar
     2 *
     3 * This file is part of Owl.
     4 *
     5 * Owl is free software: you can redistribute it and/or modify
     6 * it under the terms of the GNU General Public License as published by
     7 * the Free Software Foundation, either version 3 of the License, or
     8 * (at your option) any later version.
     9 *
     10 * Owl is distributed in the hope that it will be useful,
     11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 * GNU General Public License for more details.
     14 *
     15 * You should have received a copy of the GNU General Public License
     16 * along with Owl.  If not, see <http://www.gnu.org/licenses/>.
     17 *
     18 * ---------------------------------------------------------------
     19 *
     20 * As of Owl version 2.1.12 there are patches contributed by
     21 * developers of the the branched BarnOwl project, Copyright (c)
     22 * 2006-2008 The BarnOwl Developers. All rights reserved.
     23 */
     24
    125#include <stdio.h>
    226#include <stdio.h>
    … …  
    239263{
    240264  if (message) {
    241     owl_function_error(message);
     265    owl_function_error("%s", message);
    242266  } else {
    243267    owl_function_error("Authentication error on login");
    … …  
    948972 
    949973  if (modname) {
    950     if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
     974    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
    951975      /* perror("memrequest: malloc"); */
    952976      return -1;
    … …  
    954978    sprintf(filename, "%s/%s.ocm", priv->aimbinarypath, modname);
    955979  } else {
    956     if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
     980    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
    957981      /* perror("memrequest: malloc"); */
    958982      return -1;
    … …  
    964988    if (!modname) {
    965989      /* perror("memrequest: stat"); */
    966       free(filename);
     990      owl_free(filename);
    967991      return -1;
    968992    }
    … …  
    9861010    int i;
    9871011   
    988     free(filename); /* not needed */
     1012    owl_free(filename); /* not needed */
    9891013    owl_function_error("getaimdata memrequest: recieved invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname);
    9901014    i = 8;
    … …  
    9931017    }
    9941018   
    995     if (!(buf = malloc(i))) {
     1019    if (!(buf = owl_malloc(i))) {
    9961020      return -1;
    9971021    }
    … …  
    10171041    *buflenret = i;
    10181042  } else {
    1019     if (!(buf = malloc(len))) {
    1020       free(filename);
     1043    if (!(buf = owl_malloc(len))) {
     1044      owl_free(filename);
    10211045      return -1;
    10221046    }
    … …  
    10241048    if (!(f = fopen(filename, "r"))) {
    10251049      /* perror("memrequest: fopen"); */
    1026       free(filename);
    1027       free(buf);
     1050      owl_free(filename);
     1051      owl_free(buf);
    10281052      return -1;
    10291053    }
    10301054   
    1031     free(filename);
     1055    owl_free(filename);
    10321056   
    10331057    if (fseek(f, offset, SEEK_SET) == -1) {
    10341058      /* perror("memrequest: fseek"); */
    10351059      fclose(f);
    1036       free(buf);
     1060      owl_free(buf);
    10371061      return -1;
    10381062    }
    … …  
    10411065      /* perror("memrequest: fread"); */
    10421066      fclose(f);
    1043       free(buf);
     1067      owl_free(buf);
    10441068      return -1;
    10451069    }
    … …  
    10761100  if (priv->aimbinarypath && (getaimdata(sess, &buf, &buflen, offset, len, modname) == 0)) {
    10771101    aim_sendmemblock(sess, fr->conn, offset, buflen, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
    1078     free(buf);
     1102    owl_free(buf);
    10791103  } else {
    10801104    owl_function_debugmsg("faimtest_memrequest: unable to use AIM binary (\"%s/%s\"), sending defaults...\n", priv->aimbinarypath, modname);
    … …  
    13421366      int z;
    13431367     
    1344       newbuf = malloc(i+1);
     1368      newbuf = owl_malloc(i+1);
    13451369      for (z = 0; z < i; z++)
    13461370        newbuf[z] = (z % 10)+0x30;
    13471371      newbuf[i] = '\0';
    13481372      /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_ACK | AIM_IMFLAGS_AWAY, newbuf); */
    1349       free(newbuf);
     1373      owl_free(newbuf);
    13501374    }
    13511375  } else if (strstr(tmpstr, "seticqstatus")) {
    … …  
    14521476     *
    14531477     */
    1454     strncpy(realmsg, args->msg, sizeof(realmsg));
     1478    if (!args->msg) {
     1479      if (args->mpmsg.parts->data) {
     1480        strncpy(realmsg,args->mpmsg.parts->data, sizeof(realmsg));
     1481      } else {
     1482        strncpy(realmsg,"",1);
     1483      }
     1484    } else {
     1485      strncpy(realmsg, args->msg, sizeof(realmsg));
     1486    }
    14551487  }
    14561488
    … …  
    16971729 
    16981730  /* printf("snac threw error (reason 0x%04x: %s)\n", reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
    1699   if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
     1731  if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
    17001732 
    17011733  return 1;
    … …  
    17141746 
    17151747  /* printf("message to %s bounced (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
    1716   if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
     1748  if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
    17171749
    17181750  if (reason==4) {
    … …  
    17351767 
    17361768  /* printf("user information for %s unavailable (reason 0x%04x: %s)\n", destsn, reason, (reason<msgerrreasonslen)?msgerrreasons[reason]:"unknown"); */
    1737   if (reason<msgerrreasonslen) owl_function_error(msgerrreasons[reason]);
     1769  if (reason<msgerrreasonslen) owl_function_error("%s", msgerrreasons[reason]);
    17381770 
    17391771  return 1;
    … …  
    23102342}
    23112343
     2344void owl_process_aim()
     2345{
     2346  if (owl_global_is_doaimevents(&g)) {
     2347    owl_aim_process_events();
     2348  }
     2349}
    23122350
    23132351/**********************************************************************************/
Note: See TracChangeset for help on using the changeset viewer.