October 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : objectManager: Show errors when checks prior to deletion fail
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: 070df9daca87fd782b4b78285621f33929aa131a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=070df9daca87fd782b4b7828… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 24 10:47:14 2007 +0200 objectManager: Show errors when checks prior to deletion fail --- include/objectManager.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index b40a461..07a8d90 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -521,10 +521,16 @@ class ObjectManager $oObject = $this->getObject(); if(!$oObject->objectGetId()) + { + addmsg("No id defined", "red"); return FALSE; + } if(!$oObject->canEdit()) + { + addmsg("You don’t have permission to delete this entry", "red"); return FALSE; + } $oSubmitterMail = $this->get_mail(TRUE, "delete"); $oCommonMail = $this->get_mail(FALSE, "delete");

1 0

Alexander Nicolaysen Sørnes : version: Fix ordering entries by id
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: c71456d159643e84cd1d8a7a0dcd729dd195539a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c71456d159643e84cd1d8a7a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 25 00:07:05 2007 +0200 version: Fix ordering entries by id --- include/version.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/version.php b/include/version.php index 8d49bf3..9d97553 100644 --- a/include/version.php +++ b/include/version.php @@ -1482,7 +1482,7 @@ class version { AND appVersion.submitterId = '?' AND - appVersion.queued = '?' ORDER BY '?'$sLimit"; + appVersion.queued = '?' ORDER BY ?$sLimit"; else $sQuery = "SELECT appVersion.* FROM appVersion, appMaintainers, appFamily WHERE @@ -1508,7 +1508,7 @@ class version { AND appMaintainers.queued = 'false' AND - appVersion.queued = '?' ORDER BY '?'$sLimit"; + appVersion.queued = '?' ORDER BY ?$sLimit"; if($sLimit) { @@ -1527,7 +1527,7 @@ class version { AND appFamily.queued = 'false' AND - appVersion.queued = '?' ORDER BY '?'$sLimit"; + appVersion.queued = '?' ORDER BY ?$sLimit"; if($sLimit) {

1 0

Alexander Nicolaysen Sørnes : objectManager: Prevent changing variables prior to permission checks in form
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: b6f1f2219243a740492f4eb2e75a6e8501a3f574 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b6f1f2219243a740492f4eb2… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 24 10:59:22 2007 +0200 objectManager: Prevent changing variables prior to permission checks in form processing --- include/objectManager.php | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 07a8d90..c9ae56f 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -519,14 +519,17 @@ class ObjectManager $this->checkMethods(array("delete", "canEdit")); $oObject = $this->getObject(); + $oOriginalObject = new $this->sClass($this->iId); /* Prevent possible security hole if users change key + variables, making the permission checks run on + the wrong criteria */ - if(!$oObject->objectGetId()) + if(!$oOriginalObject->objectGetId()) { addmsg("No id defined", "red"); return FALSE; } - if(!$oObject->canEdit()) + if(!$oOriginalObject->canEdit()) { addmsg("You don’t have permission to delete this entry", "red"); return FALSE; @@ -923,6 +926,9 @@ class ObjectManager $this->iId = $this->getIdFromInput($aClean); $oObject = new $this->sClass($this->iId); + $oOriginalObject = new $this->sClass($this->iId); /* Prevent possible security hole if users change key + variables, making the permission checks run on + the wrong criteria */ /* If it isn't implemented, that means there is no default text */ if(method_exists(new $this->sClass, "getDefaultReply")) @@ -968,13 +974,13 @@ class ObjectManager // otherwise we should create the entry in the 'else' case if($this->iId) { - if(!$oObject->canEdit()) + if(!$oOriginalObject->canEdit()) return FALSE; if($this->bIsRejected) $oObject->ReQueue(); - if($this->bIsQueue && !$oObject->mustBeQueued()) + if($this->bIsQueue && !$oOriginalObject->mustBeQueued()) $oObject->unQueue(); $oObject->update(); @@ -987,7 +993,7 @@ class ObjectManager break; case "Reject": - if(!$oObject->canEdit()) + if(!$oOriginalObject->canEdit()) return FALSE; $oObject->reject();

1 0

Alexander Nicolaysen Sørnes : add objectManager::error_exit() and use it in application::display()
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: fcd40be8a488d13f71b3832b3a1de78e8c719cca URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fcd40be8a488d13f71b3832b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 24 17:54:13 2007 +0200 add objectManager::error_exit() and use it in application::display() --- include/application.php | 2 +- include/objectManager.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 386fd74..2e5291d 100644 --- a/include/application.php +++ b/include/application.php @@ -692,7 +692,7 @@ class Application { { /* is this user supposed to view this version? */ if(!$_SESSION['current']->canViewApplication($this)) - util_show_error_page_and_exit("Something went wrong with the application or version id"); + objectManager::error_exit("You do not have permission to view this entry"); // cat display $oCategory = new Category($this->iCatId); diff --git a/include/objectManager.php b/include/objectManager.php index c9ae56f..9350891 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -147,6 +147,13 @@ class ObjectManager return TRUE; } + public static function error_exit($shMessage) + { + echo '<div align="center"><p><font color="red"><b>'.$shMessage.'</b></font></p></div'; + echo apidb_footer(); + exit; + } + /* displays the list of entries */ public function display_table($aClean) {

1 0

Alexander Nicolaysen Sørnes : application: Fix ordering of entries by id
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: 729df377f9cce65dd7cebced7ebf5887b1e7600f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=729df377f9cce65dd7cebced… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 25 00:09:22 2007 +0200 application: Fix ordering of entries by id --- include/application.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 2e5291d..8daf89e 100644 --- a/include/application.php +++ b/include/application.php @@ -909,7 +909,7 @@ class Application { if(!$bRejected) return FALSE; - $sQuery .= " AND appFamily.submitterId = '?' ORDER BY '?'$sLimit"; + $sQuery .= " AND appFamily.submitterId = '?' ORDER BY ?$sLimit"; if($sLimit) { $hResult = query_parameters($sQuery, $sQueued, @@ -922,7 +922,7 @@ class Application { } } else { - $sQuery .= " ORDER BY '?'$sLimit"; + $sQuery .= " ORDER BY ?$sLimit"; if($sLimit) { $hResult = query_parameters($sQuery, $sQueued, $sOrderBy,

1 0

Alexander Nicolaysen Sørnes : testData: Fix ordering of test results by id
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: aa4cdd7a42db444ae9e11ee3cc25fb537a46103e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=aa4cdd7a42db444ae9e11ee3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 25 00:04:30 2007 +0200 testData: Fix ordering of test results by id --- include/testData.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/testData.php b/include/testData.php index 03b56f2..03bd92d 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1009,7 +1009,7 @@ class testData{ AND testResults.submitterId = '?' AND - testResults.queued = '?' ORDER BY '?'$sLimit"; + testResults.queued = '?' ORDER BY ?$sLimit"; } else { $sQuery = "SELECT testResults.* FROM testResults, appVersion, @@ -1036,7 +1036,7 @@ class testData{ AND appMaintainers.queued = 'false' AND - testResults.queued = '?' ORDER BY '?'$sLimit"; + testResults.queued = '?' ORDER BY ?$sLimit"; } if($sLimit) { @@ -1054,7 +1054,7 @@ class testData{ AND appVersion.queued = 'false' AND - testResults.queued = '?' ORDER by '?'$sLimit"; + testResults.queued = '?' ORDER by ?$sLimit"; if($sLimit) $hResult = query_parameters($sQuery, $sQueued, $sOrderBy, $iStart, $iRows); else

1 0

Alexander Nicolaysen Sørnes : bug: Prevent ids getting lost during form processing
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: 3edd18c101707f8e705d27d05e3bf1a53b4f1f2b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3edd18c101707f8e705d27d0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 24 10:46:20 2007 +0200 bug: Prevent ids getting lost during form processing --- include/bugs.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 79db0d2..2a1c383 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -498,8 +498,10 @@ class Bug function getOutputEditorValues($aClean) { - $this->iBug_id = $aClean['iBuglinkId']; - $this->iVersionId = $aClean['iVersionId']; + $this->iBug_id = $aClean['iBuglinkId']; + + if($aClean['iVersionId']) + $this->iVersionId = $aClean['iVersionId']; } }

1 0

Alexander Nicolaysen Sørnes : maintainer : Fix SQL field in isUserMaintainer
by Chris Morgan Oct. 24, 2007

Oct. 24, 2007

Module: appdb Branch: master Commit: 31bb4c0d9d9002e4ac94a11468150d22990f1d9a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=31bb4c0d9d9002e4ac94a114… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Oct 24 10:30:16 2007 +0200 maintainer: Fix SQL field in isUserMaintainer --- include/maintainer.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 3496292..04dbeae 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -557,11 +557,11 @@ class maintainer /* otherwise check if we maintain this specific version */ if($iVersionId) { - $sQuery = "SELECT * FROM appMaintainers WHERE userid = '?' AND versionId = '?' AND queued = '?'"; + $sQuery = "SELECT * FROM appMaintainers WHERE userId = '?' AND versionId = '?' AND queued = '?'"; $hResult = query_parameters($sQuery, $oUser->iUserId, $iVersionId, "false"); } else // are we maintaining any version ? { - $sQuery = "SELECT * FROM appMaintainers WHERE userid = '?' AND queued = '?'"; + $sQuery = "SELECT * FROM appMaintainers WHERE userId = '?' AND queued = '?'"; $hResult = query_parameters($sQuery, $oUser->iUserId, "false"); } if(!$hResult)

1 0

Andrew Talbot : winhelp: Fix a memory leak.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: da5a398cc3f4b4775715cee450551ee6bfa89764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5a398cc3f4b4775715cee45… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 23 18:55:31 2007 +0100 winhelp: Fix a memory leak. --- programs/winhelp/hlpfile.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 417148e..8882a1a 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -580,7 +580,11 @@ static BYTE* HLPFILE_DecompressGfx(BYTE* src, unsigned csz, unsigned sz, BYTE if (!tmp) return FALSE; HLPFILE_UncompressLZ77(src, src + csz, tmp); dst = tmp2 = HeapAlloc(GetProcessHeap(), 0, sz); - if (!dst) return FALSE; + if (!dst) + { + HeapFree(GetProcessHeap(), 0, tmp); + return FALSE; + } HLPFILE_UncompressRLE(tmp, tmp + sz77, &tmp2, sz); if (tmp2 - dst != sz) WINE_WARN("Bogus gfx sizes (LZ77+RunLen): %u / %u\n", tmp2 - dst, sz);

1 0

Andrew Talbot : winedbg: Fix a memory leak.
by Alexandre Julliard Oct. 24, 2007

Oct. 24, 2007

Module: wine Branch: master Commit: d275a4d3af6435af39ff7bb192f4621c20334565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d275a4d3af6435af39ff7bb19… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 23 18:06:30 2007 +0100 winedbg: Fix a memory leak. --- programs/winedbg/source.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index c1fb2eb..eb9576d 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -70,9 +70,9 @@ void source_add_path(const char* path) size = strlen(path) + 1; if (search_path) { - unsigned pos = HeapSize(GetProcessHeap(), 0, search_path); + unsigned pos = strlen(search_path) + 1; new = HeapReAlloc(GetProcessHeap(), 0, search_path, pos + size); - if (!new || !pos) return; + if (!new) return; new[pos - 1] = ';'; strcpy(&new[pos], path); }

1 0