PsychoticNinja/irssi
1
0
Fork 1
mirror of https://github.com/irssi/irssi.git synced 2025-04-25 20:41:23 -05:00
Code Issues Projects Releases Wiki Activity
5,223 Commits 7 Branches 77 Tags
Commit Graph

3896 Commits

Author SHA1 Message Date
ailin-nemui
c9f1b25a7f Merge pull request #1058 from ailin-nemui/sasl-reconnect 
copy sasl username and password values

(cherry picked from commit d23b0d22cc611e43c88d99192a59f413f951a955)
 2019-06-28 13:47:10 +02:00
ailin-nemui
98a9655ce6 Merge pull request #836 from ailin-nemui/resize 
Fix resizing of windows when used incorrectly

(cherry picked from commit 3c1bc5f9162c90aa247d024422699710419658f6)
 2018-02-13 12:43:54 +01:00
ailin-nemui
8424c1502a Merge pull request #842 from ailin-nemui/themeoob 
Fix oob in escaped theme string

(cherry picked from commit 7c31f7adc5685074d25a32737c9743089850675c)
 2018-02-13 12:43:54 +01:00
ailin-nemui
191b01a70e Merge pull request #837 from ailin-nemui/no-show 
check the error condition of mainwindow_create

(cherry picked from commit 442f6f08b4d99e86c3961be71638abec0f0f8070)
 2018-02-13 12:43:54 +01:00
Nei
36564717c9 Merge branch 'security' into 'master' 
Security

See merge request irssi/irssi!34

(cherry picked from commit b0d9cb33cd9ef9da7c331409e8b7c57a6f3aef3f)
 2018-02-13 12:43:54 +01:00
ailin-nemui
38ba3ca2c4 Merge pull request #824 from dequis/more-netsplit-revert 
Revert more of the netsplit print optimisation to fix crashes

(cherry picked from commit cfcc021c81eea84bd982a64764f62e163128acf3)
 2018-02-13 01:01:59 +01:00
ailin-nemui
a6cae91cec Merge pull request #812 from ailin-nemui/tape-netsplit 
revert netsplit print optimisation

(cherry picked from commit 7de1378dab8081932d9096e19ae3d0921e560230)
 2018-02-13 00:57:01 +01:00
Nei
8a5f445544 Merge branch 'uaf-modify' into 'master' 
Prevent a UAF error during the execution of some commands

See merge request irssi/irssi!24

(cherry picked from commit e405330e04dc344797f00c12cf8fd7f63b17e0e4)
 2018-02-13 00:08:14 +01:00
ailin-nemui
cacb48e4f4 Merge pull request #788 from LemonBoy/fix-787 
Keep a copy of the strings coming from the config

(cherry picked from commit 933fac7e9d4d1cea93887cb38bab51c938a8c687)
 2018-01-05 00:03:44 +01:00
Nei
aea5802519 Merge branch 'security' into 'master' 
Security

Closes GL#18, GL#19, GL#20, GL#21

See merge request irssi/irssi!29

(cherry picked from commit 9df3d92598108b6e68fcc5521cd1fab8462d7ec5)
 2018-01-05 00:03:17 +01:00
ailin-nemui
11f0d046de Merge pull request #769 from horgh/horgh/error-check-server-connect 
Set host to an empty string on error

(cherry picked from commit 437fbef6eb8f605320841cba119d3abbb3571a75)
 2017-10-20 17:52:45 +02:00
ailin-nemui
d2bfd44c16 Merge pull request #737 from ailin-nemui/fix-733 
Revert "Merge pull request #452 from LemonBoy/terminfo-cup"

(cherry picked from commit 13471013f31be1e2f459dfce9bc7425800b2824b)
 2017-10-20 17:52:45 +02:00
ailin-nemui
32d0daf87e Merge pull request #719 from LemonBoy/sasl-disable-none 
Setting sasl_mechanism to '' disables the auth

(cherry picked from commit 7b97edf9d1de8c270e4482c85d142303e07525c9)
 2017-10-20 17:52:45 +02:00
Nei
29f0ed96d5 Merge branch 'security' into 'master' 
Security

Closes GL#12, GL#13, GL#14, GL#15, GL#16

See merge request irssi/irssi!23

(cherry picked from commit 0557a2cb7c03483012b1557ccb0b23fe0becc264)
 2017-10-20 17:52:26 +02:00
ailin-nemui
8778d1c95a Merge pull request #723 from ailin-nemui/odd_expand_escapes 
fix weird n-fold unescaping in expand_escapes

(cherry picked from commit 1ff2f61f090a61f3bdf0bdee5c52a7907d56acfd)
 2017-07-05 16:58:19 +02:00
ailin-nemui
dbce2d447a Merge pull request #722 from dequis/back-to-the-future 
parse_time_interval: Allow negative time in settings

(cherry picked from commit 2b209348bd2a90afbe1782b0b321d99892b7002b)
 2017-07-05 16:58:04 +02:00
ailin-nemui
efaa2eeb88 Merge pull request #721 from dequis/unexpected-exits 
term-terminfo: Avoid switching out of alt screen on unexpected exits
(cherry picked from commit c56919768e1072985aab1377714ea5038417cd4d)
 2017-07-05 16:57:53 +02:00
ailin-nemui
1bcd7a8dd0 Merge pull request #714 from dequis/dcc-fname-gcc-warnings 
fe-dcc-(get|send): Fix some -Wpointer-compare with newer gcc

(cherry picked from commit 5e9a3ad80cb1bb5b8655d5fff6ee9d1dfc4419a1)
 2017-07-05 16:57:31 +02:00
Nei
5e46c6dda0 Merge branch 'security' into 'master' 
Security

Closes #10

See merge request !17

(cherry picked from commit 5e26325317c72a04c1610ad952974e206384d291)
 2017-07-05 16:57:03 +02:00
ailin-nemui
712e02960a Merge pull request #711 from ailin-nemui/24bit-reset 
do not reset true colour bit on colour reset
(cherry picked from commit 2d0a9b4ca30ab09ccf5a84d267a824e2a2059d70)
 2017-06-05 16:00:34 +02:00
ailin-nemui
d5bdf00ba6 Merge pull request #706 from dequis/parse-uint 
Add parse_uint function to improve integer overflow handling
(cherry picked from commit 31b9d115b065570020ce9be1a1d8cd49212f70a9)
 2017-06-05 16:00:05 +02:00
ailin-nemui
d8167908d0 Merge pull request #705 from ailin-nemui/nicklist-performance 
improve nicklist performance
(cherry picked from commit 476f19f1235d7d28ede002be3c7a249952124058)
 2017-06-05 15:59:46 +02:00
ailin-nemui
54215ce958 Merge pull request #702 from vague666/server_modify_notls 
Added support for -notls and -notls_verify
(cherry picked from commit 10cea6169694808ab2bf2caf9451cfac2db0d9da)
 2017-06-05 15:59:31 +02:00
ailin-nemui
2520ea3381 Merge pull request #688 from josephbisch/fix-687 
Add syntax info for completion
(cherry picked from commit 411ace0a15483d44b4bd0016f586108630cd5142)
 2017-06-05 15:58:58 +02:00
ailin-nemui
35e56cdb75 Merge pull request #685 from josephbisch/fix-462 
Fix strange history behavior when history is empty
(cherry picked from commit 3f69e718044ac87eeb5144be6113c2be33261cd0)
 2017-06-05 15:58:44 +02:00
ailin-nemui
7fc08ba0e5 Merge pull request #680 from Stevie-O/slow-startup-with-glib-2.49.3 
Fix slow startup with glib 2.49.3
(cherry picked from commit 3d4ba86a91b4f246665259c1e2100f5768e89237)
 2017-06-05 15:58:30 +02:00
Ailin Nemui
1f1868c532 Merge remote-tracking branch 'gitlab/security' 
(cherry picked from commit fb08fc7f1aa6b2e616413d003bf021612301ad55)
 2017-06-05 15:55:23 +02:00
Joseph Bisch
8724b4a7a7 Merge branch 'off-by-one-fix' into 'master' 
Fix off by one error with char_expandos

See merge request !11
(cherry picked from commit d5e23f97a7f98177bedc1842430a1199785bee20)
 2017-06-05 15:55:06 +02:00
ailin-nemui
a0c34463a5 Merge pull request #669 from dequis/expand-double-backslash 
expand_escape: expand double backslash as a backslash
(cherry picked from commit 26187d1d30f589d10300de2798f5a3ec4b0c1a3d)
 2017-03-10 17:21:45 +01:00
ailin-nemui
9d1adffc75 Merge pull request #667 from ailin-nemui/fix-dcc-get 
fix dcc get

fixes #656
(cherry picked from commit d57c64adeb7b251c5347212239ed0d7b7abe5547)
 2017-03-10 17:21:34 +01:00
Nei
554586cddf Merge branch 'd-minor' into 'master' 
Prevent some potential null-pointer deferences.

See merge request !9
(cherry picked from commit 7ef22687f9291ef10072cc55bc64e3db3ad5a546)
 2017-03-10 17:20:52 +01:00
ailin-nemui
dfffb0e9d8 Merge pull request #628 from LemonBoy/openssl-compat 
Support OpenSSL 1.1.0.
(cherry picked from commit ff5dd3673ee6b60d95e89dd89aa3605c79a93ac1)
 2017-03-10 17:20:30 +01:00
Ailin Nemui
39e591468d Merge branch 'netjoin-timeout' into 'master' 
fe-netjoin: remove irc servers on "server disconnected" signal

Closes #7

See merge request !10

(cherry picked from commit 77b2631c78461965bc9a7414aae206b5c514e1b3)
 2017-03-10 17:20:10 +01:00
ailin-nemui
c111e09133 Merge pull request #652 from LemonBoy/trailing-arg 
Properly check the command arguments in tail place.
 2017-03-10 17:19:57 +01:00
Nei
97b182089e Merge branch 'dub-the-wub' into 'master' 
Prevent a memory leak during the processing of the SASL response.

See merge request !8
 2017-02-03 20:29:22 +01:00
LemonBoy
1f42d2aa95 Merge pull request #619 from hannob/master 
perl_parse needs NULL terminated parameter list.
 2017-02-03 20:28:35 +01:00
LemonBoy
d63c93ae1d Merge pull request #613 from ailin-nemui/fix_completion 
fix regression in completion
 2017-02-03 20:28:25 +01:00
LemonBoy
929c947747 Merge pull request #608 from tijko/master 
Follow g_strsplit with call to g_strfreev
 2017-02-03 20:28:12 +01:00
ailin-nemui
8dbf186ad6 Merge pull request #604 from dequis/solaris 
Add OPENSSL_NO_EC for solaris 11.3, see issue #598
 2017-02-03 20:27:18 +01:00
ailin-nemui
7c49ed2d17 Merge pull request #602 from McDutchie/master 
make irssi --with-perl build with separate object directory
 2017-02-03 20:26:30 +01:00
ailin-nemui
33107be748 fix GRegex GError problem 2017-01-05 13:06:55 +01:00
Nei
7a112e0217 Merge branch 'master' into 'security' 
Sync to master

See merge request !6
 2017-01-03 13:30:39 +01:00
ailin-nemui
01163710e7 Merge pull request #585 from ailin-nemui/win_seq 
g_sequence backing for window list
 2017-01-03 12:45:50 +01:00
Ailin Nemui
1f72b8e66a up abi version 2017-01-03 12:29:52 +01:00
Ailin Nemui
f5cbbebc2e switch for gregex and regex.h 2017-01-03 12:29:11 +01:00
Nei
1b99299ed2 Merge branch 'percent_flag' into 'security' 
fix %[

See merge request !5
 2017-01-02 17:01:47 +00:00
Nei
124bcd4804 Merge branch '4-use-after-free-when-receiving-numeric-432-invalid-nick' into 'security' 
avoid server_disconnect

See merge request !4
 2017-01-02 17:01:29 +00:00
Nei
c3cca5ecf3 Merge branch '1-null-pointer-dereference-in-irc_nickcmp_rfc1459' into 'security' 
bail out if nick is NULL

See merge request !3
 2017-01-02 17:01:05 +00:00
Nei
24d2d039b5 Merge branch '3-out-of-bounds-read-with-invalid-utf8-in-term_addstr' into 'security' 
Fix oob read on invalid utf8 in term_addstr

See merge request !2
 2017-01-02 17:00:44 +00:00
Nei
7daa7a6aa9 Merge branch '2-out-of-bounds-read-of-one-byte-with-x1b-48-in-truecolor-builds' into 'security' 
check for end of string in ansi 48

See merge request !1
 2017-01-02 17:00:15 +00:00