Vinson Lee wrote: > I will commit new bug fixes to mesa_7_6_branch. > > What should be done with fixes that were initially committed to > mesa_7_7_branch?
Nothing. If the changes you make to the 7.6 branch are identical to the ones on the 7.7 branch (try cherry-picking) there likely won't be any problems when merging 7.6 -> 7.7. Thanks. -Brian > ________________________________________ > From: Keith Whitwell [[email protected]] > Sent: Monday, November 30, 2009 11:32 PM > To: Ian Romanick; Vinson Lee > Cc: [email protected] > Subject: RE: [Mesa3d-dev] Mesa (mesa_7_7_branch): mesa: Fix array > out-of-bounds access by _mesa_TexGeni. > > It should be straightforward to handle this - it just means merging 7.6->7.7 > and then 7.7->master. > > Vinson - is there any problem doing your bugfixing against the 7.6 branch, > and then having the changes flow into master as above? > > Keith > ________________________________________ > From: Ian Romanick [[email protected]] > Sent: Monday, November 30, 2009 5:37 PM > To: Vinson Lee > Cc: [email protected] > Subject: Re: [Mesa3d-dev] Mesa (mesa_7_7_branch): mesa: Fix array > out-of-bounds access by _mesa_TexGeni. > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Vinson Lee wrote: >> Module: Mesa >> Branch: mesa_7_7_branch > > Our agreed process is that bug fixes, especially ones with low > probability of breaking other things, are supposed to go into the oldest > open tree *first*. In this case, and the case of the several other of > your recent commits, this should have been mesa_7_6_branch. > > If having more than two open trees is a problem for people because of > this policy, we probably need to revisit the policy. Having a stable > release branch, a stabilization branch, and a development branch is not > outrageous. We should be able to handle this. > >> Commit: d55fb7c835b56951f05a058083e7eda264ba192e >> URL: >> http://cgit.freedesktop.org/mesa/mesa/commit/?id=d55fb7c835b56951f05a058083e7eda264ba192e >> >> Author: Vinson Lee <[email protected]> >> Date: Sat Nov 28 23:47:23 2009 -0500 >> >> mesa: Fix array out-of-bounds access by _mesa_TexGeni. >> >> _mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument >> as an array. >> >> --- >> >> src/mesa/main/texgen.c | 5 ++++- >> 1 files changed, 4 insertions(+), 1 deletions(-) >> >> diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c >> index 733e129..087f66b 100644 >> --- a/src/mesa/main/texgen.c >> +++ b/src/mesa/main/texgen.c >> @@ -218,7 +218,10 @@ _mesa_TexGenf( GLenum coord, GLenum pname, GLfloat >> param ) >> void GLAPIENTRY >> _mesa_TexGeni( GLenum coord, GLenum pname, GLint param ) >> { >> - _mesa_TexGeniv( coord, pname, ¶m ); >> + GLint p[4]; >> + p[0] = param; >> + p[1] = p[2] = p[3] = 0; >> + _mesa_TexGeniv( coord, pname, p ); >> } >> >> > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.10 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iEYEARECAAYFAksUcz8ACgkQX1gOwKyEAw/ZBACeONR4L2x7uYPWytduwJ0qkcuc > TFEAnRhVeKs6nUtTh7XK0BTX/21/WL13 > =SUbJ > -----END PGP SIGNATURE----- > > ------------------------------------------------------------------------------ > Join us December 9, 2009 for the Red Hat Virtual Experience, > a free event focused on virtualization and cloud computing. > Attend in-depth sessions from your desk. Your couch. Anywhere. > http://p.sf.net/sfu/redhat-sfdev2dev > _______________________________________________ > Mesa3d-dev mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > > ------------------------------------------------------------------------------ > Join us December 9, 2009 for the Red Hat Virtual Experience, > a free event focused on virtualization and cloud computing. > Attend in-depth sessions from your desk. Your couch. Anywhere. > http://p.sf.net/sfu/redhat-sfdev2dev > _______________________________________________ > Mesa3d-dev mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > . > ------------------------------------------------------------------------------ Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
