Commit graph

3,888 commits

Author SHA1 Message Date
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 933fac7e9d)
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 9df3d92598)
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 437fbef6eb)
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 13471013f3)
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 7b97edf9d1)
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 0557a2cb7c)
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 1ff2f61f09)
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 2b209348bd)
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 c56919768e)
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 5e9a3ad80c)
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 5e26325317)
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 2d0a9b4ca3)
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 31b9d115b0)
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 476f19f123)
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 10cea61696)
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 411ace0a15)
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 3f69e71804)
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 3d4ba86a91)
2017-06-05 15:58:30 +02:00
Ailin Nemui
1f1868c532 Merge remote-tracking branch 'gitlab/security'
(cherry picked from commit fb08fc7f1a)
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 d5e23f97a7)
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 26187d1d30)
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 d57c64adeb)
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 7ef22687f9)
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 ff5dd3673e)
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 77b2631c78)
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
LemonBoy
5dcf291f21 Use the RAW flag when building the regexps.
Also, plugged a memory leak when retrieving the match position.
2017-01-02 17:50:14 +01:00
LemonBoy
5eaead761f Rebase against master. 2017-01-02 17:50:14 +01:00
LemonBoy
3fcd3cd2b9 Remove the regexp_compiled field.
It was made redundant by the introduction of the pointer to the GRegex
structure.
Silence the compiler warning in textbuffer.c about preg being
initialized by setting it to NULL.
2017-01-02 17:50:14 +01:00
LemonBoy
8e5db471e4 Use GLib's regexp interface (backed by PCRE) 2017-01-02 17:50:14 +01:00
ailin-nemui
91f48c6f0e Merge pull request #586 from LemonBoy/fix-580
Process the nick changes in queries before the PRIVMSG is handled.
2017-01-02 14:44:07 +01:00
LemonBoy
7e22d051ae Make sure SASL was actually requested before failing. 2017-01-01 23:08:38 +01:00
ailin-nemui
77ff8f5b74 Merge pull request #514 from LemonBoy/sasl_fail
Add an option to stop the connection when SASL fails.
2016-12-21 15:29:26 +01:00
ailin-nemui
07050e2a3c Merge pull request #587 from ailin-nemui/sbar_crash
add assertion to statusbar_read_group
2016-12-21 15:28:17 +01:00