diff options
Diffstat (limited to 'testing/kdelibs/kdelibs-skipname.patch')
-rw-r--r-- | testing/kdelibs/kdelibs-skipname.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/testing/kdelibs/kdelibs-skipname.patch b/testing/kdelibs/kdelibs-skipname.patch deleted file mode 100644 index 7bcb5895e..000000000 --- a/testing/kdelibs/kdelibs-skipname.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- kdelibs-4.6.3.orig/kio/misc/kpac/discovery.cpp -+++ kdelibs-4.6.3/kio/misc/kpac/discovery.cpp -@@ -90,6 +90,34 @@ - return !m_hostname.isEmpty(); - } - -+ int -+ Discovery::skipName(const unsigned char *comp_dn, const unsigned char *eom) const -+ { -+ const u_char *cp; -+ int n; -+ -+ cp = comp_dn; -+ while (cp < eom && (n = *cp++)) { -+ /* -+ * check for indirection -+ */ -+ switch (n & INDIR_MASK) { -+ case 0: /* normal case, n == len */ -+ cp += n; -+ continue; -+ case INDIR_MASK: /* indirection */ -+ cp++; -+ break; -+ default: /* illegal type */ -+ return (-1); -+ } -+ break; -+ } -+ if (cp > eom) -+ return (-1); -+ return (cp - comp_dn); -+ } -+ - bool Discovery::checkDomain() const - { - // If a domain has a SOA record, don't traverse any higher. -@@ -107,10 +135,10 @@ - unsigned char* pos = response.buf + sizeof( response.header ); - unsigned char* end = response.buf + len; - // skip query section -- pos += dn_skipname( pos, end ) + QFIXEDSZ; -+ pos += this->skipName( pos, end ) + QFIXEDSZ; - if ( pos >= end ) return true; - // skip answer domain -- pos += dn_skipname( pos, end ); -+ pos += this->skipName( pos, end ); - short type; - GETSHORT( type, pos ); - return type != T_SOA; ---- kdelibs-4.6.3.orig/kio/misc/kpac/discovery.h -+++ kdelibs-4.6.3/kio/misc/kpac/discovery.h -@@ -43,6 +43,7 @@ - private: - bool initHostName(); - bool checkDomain() const; -+ int skipName(const unsigned char*, const unsigned char*) const; - - KProcess* m_helper; - QString m_hostname; |