Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[janderwald] 22202: make _tfullpath pass all msvcrt_winetest dir tests
by janderwald＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: janderwald Date: Sun Jun 4 14:23:28 2006 New Revision: 22202 URL: http://svn.reactos.ru/svn/reactos?rev=22202&view=rev Log: make _tfullpath pass all msvcrt_winetest dir tests Modified: trunk/reactos/lib/crt/stdlib/fullpath.c Modified: trunk/reactos/lib/crt/stdlib/fullpath.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/fullpath.c?r… ============================================================================== --- trunk/reactos/lib/crt/stdlib/fullpath.c (original) +++ trunk/reactos/lib/crt/stdlib/fullpath.c Sun Jun 4 14:23:28 2006 @@ -17,8 +17,16 @@ _TCHAR* _tfullpath(_TCHAR* absPath, const _TCHAR* relPath, size_t maxLength) { _TCHAR* lpFilePart; + DWORD copied; - if (GetFullPathName(relPath,maxLength,absPath,&lpFilePart) == 0) + if (!absPath) + { + maxLength = MAX_PATH; + absPath = malloc(maxLength); + } + + copied = GetFullPathName(relPath,maxLength,absPath,&lpFilePart); + if (copied == 0 || copied > maxLength) return NULL; return absPath;

1 0

[greatlrd] 22201: [AUDIT] this code is clear, no signs of revers is found it is only around 3-4 line of one function
by greatlrd＠svn.reactos.org 04 Jun '06

04 Jun '06

Author: greatlrd Date: Sun Jun 4 14:14:45 2006 New Revision: 22201 URL: http://svn.reactos.ru/svn/reactos?rev=22201&view=rev Log: [AUDIT] this code is clear, no signs of revers is found it is only around 3-4 line of one function Modified: trunk/reactos/lib/crt/stdlib/fullpath.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/fullpath.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22200: do not cuase crash in dhcp when no networkcard is found
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sun Jun 4 00:29:26 2006 New Revision: 22200 URL: http://svn.reactos.ru/svn/reactos?rev=22200&view=rev Log: do not cuase crash in dhcp when no networkcard is found Modified: trunk/reactos/base/services/dhcp/util.c Modified: trunk/reactos/base/services/dhcp/util.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/dhcp/util.c?r… ============================================================================== --- trunk/reactos/base/services/dhcp/util.c (original) +++ trunk/reactos/base/services/dhcp/util.c Sun Jun 4 00:29:26 2006 @@ -98,10 +98,19 @@ int read_client_conf(void) { /* What a strage dance */ - struct client_config *config = ifi->client->config; + struct client_config *config; char ComputerName [MAX_COMPUTERNAME_LENGTH + 1]; DWORD ComputerNameSize = sizeof ComputerName / sizeof ComputerName[0]; + if ((ifi!= NULL) && (ifi->client->config != NULL)) + config = ifi->client->config; + else + { + warn("util.c read_client_conf poorly implemented!"); + return 0; + } + + GetComputerName(ComputerName, & ComputerNameSize); /* This never gets freed since it's only called once */ LPSTR lpCompName =

1 0

[frik85] 22199: Security update: Fix a new well known MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html).
by frik85＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: frik85 Date: Sat Jun 3 22:02:24 2006 New Revision: 22199 URL: http://svn.reactos.ru/svn/reactos?rev=22199&view=rev Log: Security update: Fix a new well known MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html). Modified: trunk/web/reactos.org/htdocs/roscms/index.php trunk/web/reactos.org/htdocs/support/index.php trunk/web/reactos.org/htdocs/wiki/index.php Modified: trunk/web/reactos.org/htdocs/roscms/index.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/roscms/index… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/index.php (original) +++ trunk/web/reactos.org/htdocs/roscms/index.php Sat Jun 3 22:02:24 2006 @@ -32,12 +32,19 @@ //include("./inc/db/connect_db.inc.php"); include("connect.db.php"); + + // stop MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html): + $SQLinjectionprevention ="SET GLOBAL sql_mode='NO_BACKSLASH_ESCAPES';"; + $SQLinjectionprevention_query=mysql_query($SQLinjectionprevention); + + + /* * ReactOS CMS System - Version 2006-05-22 * * (c) by Klemens Friedl <frik85> * - */ + */ if ( !defined('ROSCMS_SYSTEM') ) { define ("ROSCMS_SYSTEM", "Version 0.1"); // to prevent hacking activity @@ -392,7 +399,7 @@ include("inc/body.php"); break; - case "generate_fast": // Generate the static HTML pages (for direct link, e.g. http://www.reactos.org/roscms/?page=generate"); TODO check why this link doesn't work -> errors, etc.? + case "generate_fast_secret": // Generate the static HTML pages (for direct link, e.g. http://www.reactos.org/roscms/?page=generate"); TODO check why this link doesn't work -> errors, etc.? //require("inc/login.php"); include("inc/generate_page.php"); // static page generator break; Modified: trunk/web/reactos.org/htdocs/support/index.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/support/inde… ============================================================================== --- trunk/web/reactos.org/htdocs/support/index.php (original) +++ trunk/web/reactos.org/htdocs/support/index.php Sat Jun 3 22:02:24 2006 @@ -1,29 +1,11 @@ <?php - /* - RSDB - ReactOS Support Database - Copyright (C) 2005-2006 Klemens Friedl <frik85(a)reactos.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * ReactOS Support Database System - RSDB * * (c) by Klemens Friedl <frik85> * - * 2005 - 2006 + * 11/2005, 12/2005, 01/2006, 02/2006 */ error_reporting(E_ALL); @@ -33,10 +15,19 @@ die("ERROR: Disable 'magic quotes' in php.ini (=Off)"); } + + //global $HTTP_GET_VARS; // set the Get var global require_once("connect.db.php"); + + + + // stop MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html): + $SQLinjectionprevention ="SET GLOBAL sql_mode='NO_BACKSLASH_ESCAPES';"; + $SQLinjectionprevention_query=mysql_query($SQLinjectionprevention); + Modified: trunk/web/reactos.org/htdocs/wiki/index.php URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/htdocs/wiki/index.p… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/index.php (original) +++ trunk/web/reactos.org/htdocs/wiki/index.php Sat Jun 3 22:02:24 2006 @@ -61,6 +61,13 @@ require_once( './LocalSettings.php' ); require_once( 'includes/Setup.php' ); + + + // stop MySQL bug (http://dev.mysql.com/doc/refman/4.1/en/news-4-1-20.html): + $SQLinjectionprevention ="SET GLOBAL sql_mode='NO_BACKSLASH_ESCAPES';"; + $SQLinjectionprevention_query=mysql_query($SQLinjectionprevention); + + wfProfileIn( 'main-misc-setup' ); OutputPage::setEncodings(); # Not really used yet

1 0

[greatlrd] 22198: sorrry I did break the build
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 21:45:07 2006 New Revision: 22198 URL: http://svn.reactos.ru/svn/reactos?rev=22198&view=rev Log: sorrry I did break the build Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 21:45:07 2006 @@ -60,7 +60,7 @@ size_t nSize = _nmemb * _size; size_t cSize = ROUND_SIZE(nSize); - if ((_nmemb > ((size_t)-1 / _size) || (cSize<nSize)) + if ( (_nmemb > ((size_t)-1 / _size)) || (cSize<nSize)) return NULL; return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, cSize ); @@ -73,7 +73,7 @@ { size_t nSize; - if (( _size == 0) && (_ptr !=NULL) + if (( _size == 0) && (_ptr !=NULL)) return NULL; nSize = ROUND_SIZE(_size);

1 0

[greatlrd] 22197: fixing malloc and realloc so it return right value do not mix the doc over malloc and realloc. Thanks filip <filip2307> malloc(0) -> valid buffer <GreatLord> then I revert that change <filip2307> realloc(<non-null pointer>, 0) -> NULL <filip2307> realloc(NULL, 0) -> valid buffer
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 21:40:23 2006 New Revision: 22197 URL: http://svn.reactos.ru/svn/reactos?rev=22197&view=rev Log: fixing malloc and realloc so it return right value do not mix the doc over malloc and realloc. Thanks filip <filip2307> malloc(0) -> valid buffer <GreatLord> then I revert that change <filip2307> realloc(<non-null pointer>, 0) -> NULL <filip2307> realloc(NULL, 0) -> valid buffer Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 21:40:23 2006 @@ -36,12 +36,7 @@ */ void* malloc(size_t _size) { - size_t nSize; - - if ( _size == 0) - return NULL; - - nSize = ROUND_SIZE(_size); + size_t nSize = ROUND_SIZE(_size); if (nSize<_size) return NULL; @@ -65,7 +60,7 @@ size_t nSize = _nmemb * _size; size_t cSize = ROUND_SIZE(nSize); - if ((_nmemb > ((size_t)-1 / _size) || (nSize == 0) || (cSize<nSize)) + if ((_nmemb > ((size_t)-1 / _size) || (cSize<nSize)) return NULL; return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, cSize ); @@ -78,7 +73,7 @@ { size_t nSize; - if ( _size == 0) + if (( _size == 0) && (_ptr !=NULL) return NULL; nSize = ROUND_SIZE(_size); @@ -98,10 +93,7 @@ void* _expand(void* _ptr, size_t _size) { size_t nSize; - - if ( _size == 0) - return NULL; - + nSize = ROUND_SIZE(_size); if (nSize<_size)

1 0

[greatlrd] 22196: Fix overflow caltions bugs in varus memmory functions, Thanks irc : Elrond (from TNG) for fixing calloc overflow bug.
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 21:18:09 2006 New Revision: 22196 URL: http://svn.reactos.ru/svn/reactos?rev=22196&view=rev Log: Fix overflow caltions bugs in varus memmory functions, Thanks irc : Elrond (from TNG) for fixing calloc overflow bug. Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 21:18:09 2006 @@ -36,10 +36,17 @@ */ void* malloc(size_t _size) { + size_t nSize; + if ( _size == 0) return NULL; - - return HeapAlloc(hHeap, 0, ROUND_SIZE(_size)); + + nSize = ROUND_SIZE(_size); + + if (nSize<_size) + return NULL; + + return HeapAlloc(hHeap, 0, nSize); } /* @@ -54,11 +61,14 @@ * @implemented */ void* calloc(size_t _nmemb, size_t _size) -{ - if ( _size == 0) - return NULL; - - return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_SIZE(_nmemb*_size) ); +{ + size_t nSize = _nmemb * _size; + size_t cSize = ROUND_SIZE(nSize); + + if ((_nmemb > ((size_t)-1 / _size) || (nSize == 0) || (cSize<nSize)) + return NULL; + + return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, cSize ); } /* @@ -66,11 +76,18 @@ */ void* realloc(void* _ptr, size_t _size) { + size_t nSize; + if ( _size == 0) return NULL; - + + nSize = ROUND_SIZE(_size); + + if (nSize<_size) + return NULL; + if (!_ptr) return malloc(_size); - if (_size) return HeapReAlloc(hHeap, 0, _ptr, ROUND_SIZE(_size)); + if (_size) return HeapReAlloc(hHeap, 0, _ptr, nSize); free(_ptr); return NULL; } @@ -80,10 +97,17 @@ */ void* _expand(void* _ptr, size_t _size) { + size_t nSize; + if ( _size == 0) return NULL; + + nSize = ROUND_SIZE(_size); + + if (nSize<_size) + return NULL; - return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_SIZE(_size)); + return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, nSize); } /*

1 0

[greatlrd] 22195: make malloc, calloc and some other function return NULL if size is 0
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 17:22:11 2006 New Revision: 22195 URL: http://svn.reactos.ru/svn/reactos?rev=22195&view=rev Log: make malloc, calloc and some other function return NULL if size is 0 Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 17:22:11 2006 @@ -36,6 +36,9 @@ */ void* malloc(size_t _size) { + if ( _size == 0) + return NULL; + return HeapAlloc(hHeap, 0, ROUND_SIZE(_size)); } @@ -52,6 +55,9 @@ */ void* calloc(size_t _nmemb, size_t _size) { + if ( _size == 0) + return NULL; + return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_SIZE(_nmemb*_size) ); } @@ -60,6 +66,9 @@ */ void* realloc(void* _ptr, size_t _size) { + if ( _size == 0) + return NULL; + if (!_ptr) return malloc(_size); if (_size) return HeapReAlloc(hHeap, 0, _ptr, ROUND_SIZE(_size)); free(_ptr); @@ -71,6 +80,9 @@ */ void* _expand(void* _ptr, size_t _size) { + if ( _size == 0) + return NULL; + return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_SIZE(_size)); }

1 0

[greatlrd] 22194: [AUDIT] this code is clear, no signs of revers is found it is only around 2-3 line of each functions
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 17:20:03 2006 New Revision: 22194 URL: http://svn.reactos.ru/svn/reactos?rev=22194&view=rev Log: [AUDIT] this code is clear, no signs of revers is found it is only around 2-3 line of each functions Modified: trunk/reactos/lib/crt/stdlib/malloc.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/malloc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[janderwald] 22193: re-enable lock
by janderwald＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: janderwald Date: Sat Jun 3 16:53:45 2006 New Revision: 22193 URL: http://svn.reactos.ru/svn/reactos?rev=22193&view=rev Log: re-enable lock Modified: trunk/reactos/ntoskrnl/cm/regfile.c (props changed) Propchange: trunk/reactos/ntoskrnl/cm/regfile.c ------------------------------------------------------------------------------ svn:needs-lock = *

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
60
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006