Compare commits

..

1 Commits

Author SHA1 Message Date
Roman Savochenko aece7d56ac krfb: Crashes after the VNC client disconnect
5 years ago

@ -1,4 +1,4 @@
cmake_minimum_required( VERSION 3.5 )
cmake_minimum_required(VERSION 2.6)
if( POLICY CMP0037 )
cmake_policy(SET CMP0037 NEW)
endif( POLICY CMP0037 )
@ -314,7 +314,7 @@ endif(WITH_SASL AND LIBSASL2_LIBRARIES AND SASL2_INCLUDE_DIR)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rfb/rfbconfig.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/rfb/rfbconfig.h)
set(LIBVNCSERVER_SOURCES
${LIBVNCSERVER_DIR}/main.cpp
${LIBVNCSERVER_DIR}/main.cc
${LIBVNCSERVER_DIR}/rfbserver.c
${LIBVNCSERVER_DIR}/rfbregion.c
${LIBVNCSERVER_DIR}/auth.c

@ -82,7 +82,7 @@ static const unsigned char pc2[48] = {
void rfbDesKey(unsigned char *key,
int edf)
{
int i, j, l, m, n;
register int i, j, l, m, n;
unsigned char pc1m[56], pcr[56];
unsigned long kn[32];
@ -115,11 +115,11 @@ void rfbDesKey(unsigned char *key,
return;
}
static void cookey(unsigned long *raw1)
static void cookey(register unsigned long *raw1)
{
unsigned long *cook, *raw0;
register unsigned long *cook, *raw0;
unsigned long dough[32];
int i;
register int i;
cook = dough;
for( i = 0; i < 16; i++, raw1++ ) {
@ -138,9 +138,9 @@ static void cookey(unsigned long *raw1)
}
void rfbUseKey(unsigned long *from)
void rfbUseKey(register unsigned long *from)
{
unsigned long *to, *endp;
register unsigned long *to, *endp;
to = KnL, endp = &KnL[32];
while( to < endp ) *to++ = *from++;
@ -158,8 +158,8 @@ void rfbDes(unsigned char *inblock,
return;
}
static void scrunch(unsigned char *outof,
unsigned long *into)
static void scrunch(register unsigned char *outof,
register unsigned long *into)
{
*into = (*outof++ & 0xffL) << 24;
*into |= (*outof++ & 0xffL) << 16;
@ -172,8 +172,8 @@ static void scrunch(unsigned char *outof,
return;
}
static void unscrun(unsigned long *outof,
unsigned char *into)
static void unscrun(register unsigned long *outof,
register unsigned char *into)
{
*into++ = (unsigned char)((*outof >> 24) & 0xffL);
*into++ = (unsigned char)((*outof >> 16) & 0xffL);
@ -330,11 +330,11 @@ static const unsigned long SP8[64] = {
0x10041040L, 0x00041000L, 0x00041000L, 0x00001040L,
0x00001040L, 0x00040040L, 0x10000000L, 0x10041000L };
static void desfunc(unsigned long *block,
unsigned long *keys)
static void desfunc(register unsigned long *block,
register unsigned long *keys)
{
unsigned long fval, work, right, leftt;
int round;
register unsigned long fval, work, right, leftt;
register int round;
leftt = block[0];
right = block[1];

@ -439,3 +439,6 @@ typedef union { lzo_bytep a; lzo_uint32_t b; } __lzo_pu32_u;
#endif
#endif /* already included */
/* vim:set ts=4 et: */

@ -2994,3 +2994,5 @@ LZO_COMPILE_TIME_ASSERT_HEADER(sizeof(lzo_int_fast64_t) == sizeof(lzo_uint_fast6
#endif
#endif /* already included */
/* vim:set ts=4 sw=4 et: */

@ -38,10 +38,6 @@
#include <errno.h>
#include <rfb/rfbclient.h>
#if LIBVNCSERVER_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifdef WIN32
#undef SOCKET
#include <winsock2.h>

@ -19,6 +19,11 @@ extern "C" {
#include <stdarg.h>
#include <errno.h>
#ifndef false
#define false 0
#define true -1
#endif
#ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@ -34,10 +39,10 @@ extern "C" {
#include <time.h>
}
#include <tqobject.h>
#include <tqvariant.h>
#include <tqtimer.h>
#include <tqthread.h>
#include <ntqobject.h>
#include <ntqvariant.h>
#include <ntqtimer.h>
#include <ntqthread.h>
#include "main.h"

@ -13,7 +13,7 @@
class ControlPipeHandlerObject : public TQObject
{
TQ_OBJECT
Q_OBJECT
public:
ControlPipeHandlerObject();
@ -28,7 +28,7 @@ class ControlPipeHandlerObject : public TQObject
class OnHoldClientHandlerObject : public TQObject
{
TQ_OBJECT
Q_OBJECT
public:
OnHoldClientHandlerObject();
@ -43,7 +43,7 @@ class OnHoldClientHandlerObject : public TQObject
class ClientOutputHandlerObject : public TQObject
{
TQ_OBJECT
Q_OBJECT
public:
ClientOutputHandlerObject();

@ -29245,6 +29245,7 @@ module.exports = function (str) {
trailingStatement: trailingStatement
};
}());
/* vim: set sw=4 ts=4 et tw=80 : */
},{}],238:[function(require,module,exports){
/*
@ -29381,6 +29382,7 @@ module.exports = function (str) {
isIdentifierPartES6: isIdentifierPartES6
};
}());
/* vim: set sw=4 ts=4 et tw=80 : */
},{}],239:[function(require,module,exports){
/*
@ -29547,6 +29549,7 @@ module.exports = function (str) {
isIdentifierES6: isIdentifierES6
};
}());
/* vim: set sw=4 ts=4 et tw=80 : */
},{"./code":238}],240:[function(require,module,exports){
/*
@ -29581,6 +29584,7 @@ module.exports = function (str) {
exports.code = require('./code');
exports.keyword = require('./keyword');
}());
/* vim: set sw=4 ts=4 et tw=80 : */
},{"./ast":237,"./code":238,"./keyword":239}],241:[function(require,module,exports){
module.exports={
@ -40319,6 +40323,7 @@ module.exports = function (str) {
};
},{}],474:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -40424,6 +40429,7 @@ ArraySet.prototype.toArray = function ArraySet_toArray() {
exports.ArraySet = ArraySet;
},{"./util":483}],475:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -40565,6 +40571,7 @@ exports.decode = function base64VLQ_decode(aStr, aIndex, aOutParam) {
};
},{"./base64":476}],476:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -40633,6 +40640,7 @@ exports.decode = function (charCode) {
};
},{}],477:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -40745,6 +40753,7 @@ exports.search = function search(aNeedle, aHaystack, aCompare, aBias) {
};
},{}],478:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2014 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -40825,6 +40834,7 @@ MappingList.prototype.toArray = function MappingList_toArray() {
exports.MappingList = MappingList;
},{"./util":483}],479:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -40940,6 +40950,7 @@ exports.quickSort = function (ary, comparator) {
};
},{}],480:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -42023,6 +42034,7 @@ IndexedSourceMapConsumer.prototype._parseMappings =
exports.IndexedSourceMapConsumer = IndexedSourceMapConsumer;
},{"./array-set":474,"./base64-vlq":475,"./binary-search":477,"./quick-sort":479,"./util":483}],481:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -42428,6 +42440,7 @@ SourceMapGenerator.prototype.toString =
exports.SourceMapGenerator = SourceMapGenerator;
},{"./array-set":474,"./base64-vlq":475,"./mapping-list":478,"./util":483}],482:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:
@ -42836,6 +42849,7 @@ SourceNode.prototype.toStringWithSourceMap = function SourceNode_toStringWithSou
exports.SourceNode = SourceNode;
},{"./source-map-generator":481,"./util":483}],483:[function(require,module,exports){
/* -*- Mode: js; js-indent-level: 2; -*- */
/*
* Copyright 2011 Mozilla Foundation and contributors
* Licensed under the New BSD license. See LICENSE or:

Loading…
Cancel
Save